From 3fa03d64274f3fa8b939991e3e61d9cdeeffb5ff Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Thu, 31 Dec 2009 17:56:30 +0000
Subject: 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>
---
 src/empathy-accounts-dialog.c  | 12 ++++++------
 src/empathy-accounts-dialog.ui |  4 ++--
 src/empathy-call-window.c      |  2 +-
 src/empathy-chat-window.ui     |  2 +-
 src/empathy-main-window.ui     |  8 ++++----
 src/empathy-status-icon.ui     |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 2c6ab617a..8a466b442 100644
--- 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 55bfa79f4..1f60bd6fa 100644
--- 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 da708d156..de19b69a4 100644
--- 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 88d099c16..13b812572 100644
--- 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 1e6ecce17..934e5122d 100644
--- 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 6d0f3672d..155193e46 100644
--- 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>
-- 
cgit v1.2.3