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>

7 files changed, 11 insertions, 11 deletions

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 6c43f447d..eecbb5d7b 100644
--- 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 8a466b442..88f5e0a73 100644
--- 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 de19b69a4..4a7d9f2f2 100644
--- 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 13b812572..c2b56251c 100644
--- 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 c9e925d21..e85837c67 100644
--- 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 2e32fe9dd..8e4e1c221 100644
--- 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 66efa217d..60f7f4b72 100644
--- 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);