Miscellaneous string fixes

Lots of small spelling and grammar fixes, as well as some terminology
cleanups.

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

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 44b278f0a986487de6c78cd4f63aa15dd2a8578c..232f1354211b62393ebf5dc8c2811f0af2570c87 100644 (file)
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -25,7 +25,7 @@
         <short>Contact list sort criterion</short>
         <long>
         Which criterion to use when sorting the contact list.
-        Default is to use sort by the contact's name with the value
+        Default is to sort by the contact's name with the value
         "name". A value of "state" will sort the contact list by state.
         </long>
       </locale>
@@ -369,9 +369,9 @@
       <type>string</type>
       <default></default>
       <locale name="C">
-         <short>Path of the adium theme to use</short>
+         <short>Path of the Adium theme to use</short>
          <long>
-           Path of the adium theme to use if the theme used for chat is adium.
+           Path of the Adium theme to use if the theme used for chat is Adium.
          </long>
       </locale>
     </schema>
@@ -413,7 +413,7 @@
       <locale name="C">
         <short>Spell checking languages</short>
         <long>
-          Comma separated list of spell checker languages to use (e.g. en, fr, nl).
+          Comma-separated list of spell checker languages to use (e.g. "en, fr, nl").
         </long>
       </locale>
     </schema>

diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui
index a36698a0987f3a6c3ab7df4fe07485cdcb768b76..495d6e94962d8fead845a07b2ddfbaa89e8f8412 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-icq.ui
+++ b/libempathy-gtk/empathy-account-widget-icq.ui
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="label_charset">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Charset:</property>
+                <property name="label" translatable="yes">_Character set:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_charset</property>
               </object>

diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index a4f7faa7f234a69035fa33ac6926440e86f6f6a1..08572bb8a53cb3a46bc0463327f6ec6379152751 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -47,7 +47,7 @@
                       <object class="GtkLabel" id="label_charset">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Charset:</property>
+                        <property name="label" translatable="yes">Character set:</property>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>

diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
index ca633309db2f45542ebf7750f6be72776358a1d6..c123aa6ff3dcbfb02bbf61cbe58efe10e07155f6 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
@@ -186,7 +186,7 @@
               <object class="GtkLabel" id="label_email">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Email:</property>
+                <property name="label" translatable="yes">_E-mail address:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_email</property>
               </object>

diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui
index 27de65a2a86722dac35a6f940d0f39552ca171b5..083f4f9bd2d96f59c8b68dd1218c692c447ef6c3 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-msn.ui
+++ b/libempathy-gtk/empathy-account-widget-msn.ui
@@ -220,7 +220,7 @@
       <object class="GtkLabel" id="label_id_simple">
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Windows Live user name?</property>
+        <property name="label" translatable="yes">What is your Windows Live ID?</property>
       </object>
       <packing>
         <property name="position">0</property>

diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index 6858619707f0cdbf1598e1709ce301d2400a0fa6..0880cc7f49f1e6eb48070c9df509258b848f0336 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ b/libempathy-gtk/empathy-account-widget-yahoo.ui
@@ -61,7 +61,7 @@
           <object class="GtkLabel" id="label_id">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Yahoo I_D:</property>
+            <property name="label" translatable="yes">Yahoo! I_D:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_id</property>
           </object>
@@ -142,7 +142,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="checkbutton_ignore_invites">
-                    <property name="label" translatable="yes">_Ignore conference and chatroom invitations</property>
+                    <property name="label" translatable="yes">_Ignore conference and chat room invitations</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -174,7 +174,7 @@
                   <object class="GtkLabel" id="label_charset">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Charset:</property>
+                    <property name="label" translatable="yes">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_charset</property>
                   </object>
@@ -276,7 +276,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkbutton_yahoojp">
-                    <property name="label" translatable="yes">Use _Yahoo Japan</property>
+                    <property name="label" translatable="yes">Use _Yahoo! Japan</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index df47d48e87d259fd432e9f9a3c367ce64c6fccb3..9c79eb852750e547be32dffedddb450f1fec5661 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -447,7 +447,7 @@ avatar_chooser_maybe_convert_and_scale (EmpathyAvatarChooser *chooser,
        /* If there is no format we can use, report error to the user. */
        if (new_mime_type == NULL || new_format_name == NULL) {
                avatar_chooser_error_show (chooser, _("Couldn't convert image"),
-                               _("None of the accepted image formats is "
+                               _("None of the accepted image formats are "
                                  "supported on your system"));
                return NULL;
        }

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index c01b12519c24e8ac71c0102041b086e8e4513bfe..3e565585bf029a6ce2965810408e7eef30f360d0 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -618,7 +618,7 @@ chat_command_join_cb (EmpathyDispatchOperation *dispatch,
        if (error != NULL) {
                DEBUG ("Error: %s", error->message);
                empathy_chat_view_append_event (chat->view,
-                       _("Failed to join chatroom"));
+                       _("Failed to join chat room"));
        }
 }
 

diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 578f8756abe52623799d62181d6a1bcde1162d87..f42bc6bdb06a03ad084cd8a28e5e06a89ae0be38 100644 (file)
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -524,7 +524,7 @@ empathy_contact_invite_menu_item_new (EmpathyContact *contact)
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-       item = gtk_image_menu_item_new_with_mnemonic (_("_Invite to chatroom"));
+       item = gtk_image_menu_item_new_with_mnemonic (_("_Invite to chat room"));
        image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_GROUP_MESSAGE,
                                              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 2e2ec3969a778cc2f1173c3ec99b0248a0fa9f05..df8f535fb72764d5194218813431a68a498a65b2 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -358,7 +358,7 @@
                     <child>
                       <object class="GtkLabel" id="label670">
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Fullname:</property>
+                        <property name="label" translatable="yes">Full name:</property>
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
@@ -368,7 +368,7 @@
                     <child>
                       <object class="GtkLabel" id="label650">
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Email:</property>
+                        <property name="label" translatable="yes">E-mail address:</property>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -380,7 +380,7 @@
                     <child>
                       <object class="GtkLabel" id="label651">
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Web site:</property>
+                        <property name="label" translatable="yes">Website:</property>
                       </object>
                       <packing>
                         <property name="top_attach">2</property>

diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index aae29d54db43fbd37660fc15de75511cdeffb08f..503e51808966ccaeed878a65ba27a21a147e7cf4 100644 (file)
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -105,13 +105,13 @@ validate_destination (NstPlugin *plugin,
 
   if (!empathy_contact_can_send_files (contact))
     {
-      *error = g_strdup (_("The contact selected cannot receive files."));
+      *error = g_strdup (_("The selected contact cannot receive files."));
       ret = FALSE;
     }
 
   if (ret && !empathy_contact_is_online (contact))
     {
-      *error = g_strdup (_("The contact selected is offline."));
+      *error = g_strdup (_("The selected contact is offline."));
       ret = FALSE;
     }
 

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 6c43f447d8227c862ebb78827a1cc4d8852a51fc..eecbb5d7bfe2903fb37f9be0ab8304c7540ebfca 100644 (file)
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -115,15 +115,15 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
   gtk_widget_show (w);
 
   if (page_num == PAGE_IMPORT)
-    message = _("There has been an error while importing the accounts.");
+    message = _("There was an error while importing the accounts.");
   else if (page_num >= PAGE_ENTER_CREATE &&
       priv->first_resp == RESPONSE_ENTER_ACCOUNT)
-    message = _("There has been an error while parsing the account details.");
+    message = _("There was an error while parsing the account details.");
   else if (page_num >= PAGE_ENTER_CREATE &&
       priv->first_resp == RESPONSE_CREATE_ACCOUNT)
-    message = _("There has been an error while creating the account.");
+    message = _("There was an error while creating the account.");
   else
-    message = _("There has been an error.");
+    message = _("There was an error.");
 
   w = gtk_label_new (message);
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 8a466b442cfd5a9a0e0c59e00b4201d5219640bf..88f5e0a73bacc1abcdffd01340386b2998506d9e 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -62,7 +62,7 @@
 /* The primary text of the dialog shown to the user when he is about to lose
  * unsaved changes */
 #define PENDING_CHANGES_QUESTION_PRIMARY_TEXT \
-  _("There are unsaved modification regarding your %s account.")
+  _("There are unsaved modifications to your %s account.")
 /* The primary text of the dialog shown to the user when he is about to lose
  * an unsaved new account */
 #define UNSAVED_NEW_ACCOUNT_QUESTION_PRIMARY_TEXT \

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index de19b69a4b4a8cf85acf3af5d54b7189c7ed092d..4a7d9f2f2c6c0c45cf658d1a3a329cb0bc0cd5a5 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1830,7 +1830,7 @@ media_stream_error_to_txt (EmpathyCallWindow *self,
             "product=Telepathy&component=%s", cm);
 
         result = g_strdup_printf (
-            _("Something not expected happened in a Telepathy component. "
+            _("Something unexpected happened in a Telepathy component. "
               "Please <a href=\"%s\">report this bug</a> and attach "
               "logs gathered from the 'Debug' window in the Help menu."), url);
 

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 13b81257248af0b17961f41b3323f92ecf7cc354..c2b56251c734410c0014fb7a3a843a073db05230 100644 (file)
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -28,7 +28,7 @@
         <child>
           <object class="GtkToggleAction" id="menu_conv_favorite">
             <property name="name">menu_conv_favorite</property>
-            <property name="label" translatable="yes">_Favorite Chatroom</property>
+            <property name="label" translatable="yes">_Favorite Chat Room</property>
           </object>
         </child>
         <child>

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c9e925d21d6ac9a09d61da20e50426bdec4f07dd..e85837c67b2af605dc22aef972c7835a4f33de15 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -346,8 +346,8 @@ event_channel_process_voip_func (EventPriv *event)
 
   gtk_message_dialog_format_secondary_text (
     GTK_MESSAGE_DIALOG (dialog), video ?
-      _("%s is video calling you, do you want to answer?"):
-      _("%s is calling you, do you want to answer?"),
+      _("%s is video calling you. Do you want to answer?"):
+      _("%s is calling you. Do you want to answer?"),
       empathy_contact_get_name (event->approval->contact));
 
   /* Set image of the dialog */

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 2e32fe9dd73cfb5ad88b439d98f7c434b97e3f08..8e4e1c2215375d44491e694c35fe9e6cbee0ae84 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -532,7 +532,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_location_resource_network">
-                                <property name="label" translatable="yes">_Network (IP, Wifi)</property>
+                                <property name="label" translatable="yes">_Network (IP, Wi-Fi)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>

diff --git a/src/empathy-tube-dispatch.c b/src/empathy-tube-dispatch.c
index 66efa217dbfb9c2409e05db14e97c7e55c956416..60f7f4b726ba55b166293ba6d23ade5142ad93ce 100644 (file)
--- a/src/empathy-tube-dispatch.c
+++ b/src/empathy-tube-dispatch.c
@@ -445,7 +445,7 @@ empathy_tube_dispatch_handle (EmpathyTubeDispatch *tube_dispatch)
 
       msg = g_strdup_printf (
         _("An invitation was offered for service %s, but you don't have the "
-          "needed application to handle it"), priv->service);
+          "application necessary to handle it"), priv->service);
 
       empathy_tube_dispatch_show_error (tube_dispatch, msg);