Punctuation fixes in translatable strings

Fix punctuation in the IRC command help messages. Use proper Unicode ellipses
throughout Empathy, and proper em-dashes where appropriate.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index dec4757dbb2f0bec5d001dd8849f06a658dd4853..c01b12519c24e8ac71c0102041b086e8e4513bfe 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -799,36 +799,36 @@ typedef struct {
 
 static ChatCommandItem commands[] = {
        {"clear", 1, 1, chat_command_clear,
-        N_("/clear, clear all messages from the current conversation")},
+        N_("/clear: clear all messages from the current conversation")},
 
        {"topic", 2, 2, chat_command_topic,
-        N_("/topic <topic>, set the topic of the current conversation")},
+        N_("/topic <topic>: set the topic of the current conversation")},
 
        {"join", 2, 2, chat_command_join,
-        N_("/join <chatroom id>, join a new chatroom")},
+        N_("/join <chat room ID>: join a new chat room")},
 
        {"j", 2, 2, chat_command_join,
-        N_("/j <chatroom id>, join a new chatroom")},
+        N_("/j <chat room ID>: join a new chat room")},
 
        {"query", 2, 3, chat_command_query,
-        N_("/query <contact id> [<message>], open a private chat")},
+        N_("/query <contact ID> [<message>]: open a private chat")},
 
        {"msg", 3, 3, chat_command_msg,
-        N_("/msg <contact id> <message>, open a private chat")},
+        N_("/msg <contact ID> <message>: open a private chat")},
 
        {"nick", 2, 2, chat_command_nick,
-        N_("/nick <nickname>, change your nickname on current server")},
+        N_("/nick <nickname>: change your nickname on the current server")},
 
        {"me", 2, 2, chat_command_me,
-        N_("/me <message>, send an ACTION message to the current conversation")},
+        N_("/me <message>: send an ACTION message to the current conversation")},
 
        {"say", 2, 2, chat_command_say,
-        N_("/say <message>, send <message> to the current conversation. "
+        N_("/say <message>: send <message> to the current conversation. "
            "This is used to send a message starting with a '/'. For example: "
-           "\"/say /join is used to join a new chatroom\"")},
+           "\"/say /join is used to join a new chat room\"")},
 
        {"help", 1, 2, chat_command_help,
-        N_("/help [<command>], show all supported commands. "
+        N_("/help [<command>]: show all supported commands. "
            "If <command> is defined, show its usage.")},
 };
 
@@ -988,7 +988,7 @@ chat_send (EmpathyChat  *chat,
 
                if (!second_slash) {
                        empathy_chat_view_append_event (chat->view,
-                               _("Unknown command, see /help for the available"
+                               _("Unknown command; see /help for the available"
                                  " commands"));
                        return;
                }

diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 3d022a8b06126dfcb17f4745a90799285d6a8f69..578f8756abe52623799d62181d6a1bcde1162d87 100644 (file)
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -192,7 +192,7 @@ empathy_contact_add_menu_item_new (EmpathyContact *contact)
                return NULL;
        }
 
-       item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact..."));
+       item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact…"));
        image = gtk_image_new_from_icon_name (GTK_STOCK_ADD,
                                              GTK_ICON_SIZE_MENU);
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);

diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index b051e8265814574633bb163148982ff2f7237f41..2e2ec3969a778cc2f1173c3ec99b0248a0fa9f05 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -437,7 +437,7 @@
                       <object class="GtkLabel" id="label653">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Information requested...</property>
+                        <property name="label" translatable="yes">Information requested…</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
                       </object>
@@ -606,7 +606,7 @@
                       <object class="GtkLabel" id="label669">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Information requested...</property>
+                        <property name="label" translatable="yes">Information requested…</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
                       </object>

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index e5826ff76d3e999aecd1c39afae62b5af656480e..f8c4212dd618e8eed15696e0262d1fcb37c9ccb6 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -164,7 +164,7 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
                                    G_TYPE_BOOLEAN,   /* COL_STATUS_CUSTOMISABLE */
                                    G_TYPE_INT);      /* COL_TYPE */
 
-       custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message..."));
+       custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message…"));
 
        for (i = 0; states[i].state != TP_CONNECTION_PRESENCE_TYPE_UNSET; i++) {
                GList       *list, *l;
@@ -200,7 +200,7 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
                        g_list_free (list);
 
                        gtk_list_store_insert_with_values (store, NULL, -1,
-                               COL_STATUS_TEXT, _("Custom Message..."),
+                               COL_STATUS_TEXT, _("Custom Message…"),
                                COL_STATE_ICON_NAME, icon_name,
                                COL_STATE, states[i].state,
                                COL_DISPLAY_MARKUP, custom_message,
@@ -217,9 +217,9 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
                        -1);
 
        gtk_list_store_insert_with_values (store, NULL, -1,
-               COL_STATUS_TEXT, _("Edit Custom Messages..."),
+               COL_STATUS_TEXT, _("Edit Custom Messages…"),
                COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
-               COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
+               COL_DISPLAY_MARKUP, _("Edit Custom Messages…"),
                COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
                -1);
 
@@ -1080,7 +1080,7 @@ empathy_presence_chooser_create_menu (void)
        gtk_widget_show (item);
 
        /* Custom messages */
-       item = gtk_image_menu_item_new_with_label (_("Custom messages..."));
+       item = gtk_image_menu_item_new_with_label (_("Custom messages…"));
        image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 2c6ab617a4f0f7e78677bc50ac228ec772c2b7f6..8a466b442cfd5a9a0e0c59e00b4201d5219640bf 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -229,7 +229,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
       switch (status)
         {
           case TP_CONNECTION_STATUS_CONNECTING:
-            message = _("Connecting...");
+            message = _("Connecting…");
             gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
                 GTK_MESSAGE_INFO);
 
@@ -245,7 +245,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
               }
             else
               {
-                message = g_strdup_printf ("%s - %s",
+                message = g_strdup_printf ("%s — %s",
                     empathy_presence_get_default_message (presence),
                     status_message);
               }
@@ -256,12 +256,12 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
             gtk_widget_hide (priv->throbber);
             break;
           case TP_CONNECTION_STATUS_DISCONNECTED:
-            message = g_strdup_printf (_("Disconnected - %s"),
+            message = g_strdup_printf (_("Disconnected — %s"),
                 empathy_status_reason_get_default_message (reason));
 
             if (reason == TP_CONNECTION_STATUS_REASON_REQUESTED)
               {
-                message = g_strdup_printf (_("Offline - %s"),
+                message = g_strdup_printf (_("Offline — %s"),
                     empathy_status_reason_get_default_message (reason));
                 gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
                     GTK_MESSAGE_WARNING);
@@ -274,7 +274,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
 
             connectivity = empathy_connectivity_dup_singleton ();
             if (!empathy_connectivity_is_online (connectivity))
-               message = _("Offline - No Network Connection");
+               message = _("Offline — No Network Connection");
 
             g_object_unref (connectivity);
             ephy_spinner_stop (EPHY_SPINNER (priv->throbber));
@@ -293,7 +293,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
     }
   else
     {
-      message = _("Offline - Account disabled");
+      message = _("Offline — Account Disabled");
 
       gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
           GTK_MESSAGE_WARNING);

diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index 55bfa79f4fa528d7bad9b33a9ace257b73b4904a..1f60bd6fa739204b508ec77b87ace3c1460c4f8a 100644 (file)
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -50,7 +50,7 @@
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkButton" id="button_add">
-                        <property name="label" translatable="yes">_Add...</property>
+                        <property name="label" translatable="yes">_Add…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -63,7 +63,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="button_import">
-                        <property name="label" translatable="yes">_Import...</property>
+                        <property name="label" translatable="yes">_Import…</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index da708d156891d8431db4767460c22a9c7107d1dc..de19b69a4b4a8cf85acf3af5d54b7189c7ed092d 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -726,7 +726,7 @@ empathy_call_window_set_state_connecting (EmpathyCallWindow *window)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (window);
 
-  empathy_call_window_status_message (window, _("Connecting..."));
+  empathy_call_window_status_message (window, _("Connecting…"));
   priv->call_state = CONNECTING;
 
   if (priv->outgoing)

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 88d099c16dc8ef7ff5035f0c3e275b30f4c2fc6d..13b81257248af0b17961f41b3323f92ecf7cc354 100644 (file)
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -41,7 +41,7 @@
         <child>
           <object class="GtkAction" id="menu_conv_invite_participant">
             <property name="name">menu_conv_invite_participant</property>
-            <property name="label" translatable="yes">Invite _Participant...</property>
+            <property name="label" translatable="yes">Invite _Participant…</property>
           </object>
         </child>
         <child>

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 1e6ecce17ead682897f8a0386ba65b123a233f98..934e5122d749be86e96941b303a1b73b650f3b32 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -14,7 +14,7 @@
           <object class="GtkAction" id="chat_new_message">
             <property name="icon-name">im-message-new</property>
             <property name="name">chat_new_message</property>
-            <property name="label" translatable="yes">_New Conversation...</property>
+            <property name="label" translatable="yes">_New Conversation…</property>
           </object>
           <accelerator key="N" modifiers="GDK_CONTROL_MASK"/>
         </child>
@@ -22,7 +22,7 @@
           <object class="GtkAction" id="chat_new_call">
             <property name="icon-name">audio-input-microphone</property>
             <property name="name">chat_new_call</property>
-            <property name="label" translatable="yes">New _Call...</property>
+            <property name="label" translatable="yes">New _Call…</property>
           </object>
           <accelerator key="M" modifiers="GDK_CONTROL_MASK"/>
         </child>
@@ -38,7 +38,7 @@
           <object class="GtkAction" id="chat_add_contact">
             <property name="stock_id">gtk-add</property>
             <property name="name">chat_add_contact</property>
-            <property name="label" translatable="yes">_Add Contact...</property>
+            <property name="label" translatable="yes">_Add Contact…</property>
           </object>
         </child>
         <child>
@@ -171,7 +171,7 @@
         <child>
           <object class="GtkAction" id="room_join_new">
             <property name="name">room_join_new</property>
-            <property name="label" translatable="yes">_Join...</property>
+            <property name="label" translatable="yes">_Join…</property>
           </object>
         </child>
         <child>

diff --git a/src/empathy-status-icon.ui b/src/empathy-status-icon.ui
index 6d0f3672dfe05f5c283d033761f79ab6ed80a028..155193e46516fa28f4df00820a718ab270ff54e7 100644 (file)
--- a/src/empathy-status-icon.ui
+++ b/src/empathy-status-icon.ui
@@ -14,14 +14,14 @@
           <object class="GtkAction" id="new_message">
             <property name="icon-name">im-message-new</property>
             <property name="name">new_message</property>
-            <property name="label" translatable="yes">_New Conversation...</property>
+            <property name="label" translatable="yes">_New Conversation…</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="new_call">
             <property name="icon-name">audio-input-microphone</property>
             <property name="name">new_call</property>
-            <property name="label" translatable="yes">New _Call...</property>
+            <property name="label" translatable="yes">New _Call…</property>
           </object>
         </child>
         <child>