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>

9 files changed, 14 insertions, 14 deletions

diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui
index a36698a09..495d6e949 100644
--- 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 a4f7faa7f..08572bb8a 100644
--- 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 ca633309d..c123aa6ff 100644
--- 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 27de65a2a..083f4f9bd 100644
--- 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 685861970..0880cc7f4 100644
--- 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 df47d48e8..9c79eb852 100644
--- 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 c01b12519..3e565585b 100644
--- 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 578f8756a..f42bc6bdb 100644
--- 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 2e2ec3969..df8f535fb 100644
--- 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>