Bug 628064 — Miscellaneous string fixes

diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index 3cc55b91cadcca2b14e7db9f0cbda59507c00ae8..7cce2261c48873821297df0e2c6287424182d88d 100644 (file)
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -3,7 +3,7 @@ Version=1.0
 _Name=Empathy
 _GenericName=IM Client
 _X-GNOME-FullName=Empathy Internet Messaging
-_Comment=Chat on Google Talk, Facebook, MSN, and many other chat services
+_Comment=Chat on Google Talk, Facebook, MSN and many other chat services
 Exec=empathy
 Icon=empathy
 StartupNotify=false

diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index 3026116e031420ac33a34f4915e5352aadb893f6..27a8cb3755574f6a310a2f7f6ba0051f8ddcb2dd 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -13,7 +13,7 @@
     <key name="autoaway" type="b">
       <default>true</default>
       <_summary>Empathy should auto-away when idle</_summary>
-      <_description>Whether Empathy should go into away mode automatically if user is idle.</_description>
+      <_description>Whether Empathy should go into away mode automatically if the user is idle.</_description>
     </key>
     <key name="import-asked" type="b">
       <default>false</default>
@@ -78,8 +78,8 @@
     <key name="events-notify-area" type="b">
       <default>true</default>
       <_summary>Display incoming events in the status area</_summary>
-      <_description>Display incoming events in the status area. If false
-present them right away to the user.</_description>
+      <_description>Display incoming events in the status area. If false,
+present them to the user immediately.</_description>
     </key>
     <key name="chat-window-paned-pos" type="i">
       <default>0</default>

diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index c69a5479026cd2882738784ea9afade49d806097..545fe679d6c61e0d370007ebb917d2425b681819 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -426,7 +426,7 @@
       <object class="GtkLabel" id="label_nick_simple">
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your IRC nick?</property>
+        <property name="label" translatable="yes">What is your IRC nickname?</property>
       </object>
       <packing>
         <property name="position">2</property>

diff --git a/libempathy-gtk/empathy-log-window.ui b/libempathy-gtk/empathy-log-window.ui
index 3220c18f46cd56e47d2533fdea4d41986b6fea05..5ce9300955e8eb88495b8d8e0f58b8eb5326f448 100644 (file)
--- a/libempathy-gtk/empathy-log-window.ui
+++ b/libempathy-gtk/empathy-log-window.ui
@@ -123,7 +123,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_next">
-                            <property name="label" translatable="yes">Find next</property>
+                            <property name="label" translatable="yes">Find Next</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -140,7 +140,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_previous">
-                            <property name="label" translatable="yes">Find previous</property>
+                            <property name="label" translatable="yes">Find Previous</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>

diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index bcfe92e65e9c0c26a44101a124745451e0fea4f3..5e37532bf6c02951fdae0486fe66f35707f6a67c 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -157,7 +157,7 @@ reason_to_string (EmpathyTLSDialog *self)
           "Authority");
       break;
     case EMP_TLS_CERTIFICATE_REJECT_REASON_EXPIRED:
-      reason_str = _("The certificate is expired");
+      reason_str = _("The certificate has expired");
       break;
     case EMP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED:
       reason_str = _("The certificate hasn't yet been activated");
@@ -266,7 +266,7 @@ empathy_tls_dialog_constructed (GObject *object)
   text = reason_to_string (self);
 
   g_object_set (message_dialog,
-      "text", _("This connection is untrusted, would you like to "
+      "text", _("This connection is untrusted. Would you like to "
           "continue anyway?"),
       "secondary-text", text,
       NULL);

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 579870f806782769de86b4a491a0d29630894535..0ee1bbcc0a5e64a84ec9d530ef0f51c8216f24e2 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -374,8 +374,8 @@ create_errors_to_message_hash (void)
                "cryptographically weak"));
        g_hash_table_insert (errors, TP_ERROR_STR_CERT_LIMIT_EXCEEDED,
                _("The length of the server certificate, or the depth of the "
-               "server certificate chain exceed the limits imposed by the "
-               "crypto library"));
+               "server certificate chain, exceed the limits imposed by the "
+               "cryptography library"));
 
        return errors;
 }

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 89c304bff9ca4001fe767a4b28e5c657d9c691f1..89673ee48f8040e9153b722ded06eba2b642503c 100644 (file)
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
         NULL },
       { "if-needed", 'n',
         0, G_OPTION_ARG_NONE, &only_if_needed,
-        N_("Don't display any dialogs if there are any non-salut accounts"),
+        N_("Don't display any dialogs if there are any non-Salut accounts"),
         NULL },
       { "select-account", 's',
         G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &selected_account_name,