From 973ebccf5c1ba3664677a8c5d1bdfe52009f82be Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 27 Aug 2010 12:33:20 +0100 Subject: =?UTF-8?q?Bug=20628064=20=E2=80=94=20Miscellaneous=20string=20fix?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/empathy.desktop.in.in | 2 +- data/org.gnome.Empathy.gschema.xml.in | 6 +++--- libempathy-gtk/empathy-account-widget-irc.ui | 2 +- libempathy-gtk/empathy-log-window.ui | 4 ++-- libempathy-gtk/empathy-tls-dialog.c | 4 ++-- libempathy/empathy-utils.c | 4 ++-- src/empathy-accounts.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in index 3cc55b91c..7cce2261c 100644 --- 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 3026116e0..27a8cb375 100644 --- a/data/org.gnome.Empathy.gschema.xml.in +++ b/data/org.gnome.Empathy.gschema.xml.in @@ -13,7 +13,7 @@ true <_summary>Empathy should auto-away when idle - <_description>Whether Empathy should go into away mode automatically if user is idle. + <_description>Whether Empathy should go into away mode automatically if the user is idle. false @@ -78,8 +78,8 @@ true <_summary>Display incoming events in the status area - <_description>Display incoming events in the status area. If false -present them right away to the user. + <_description>Display incoming events in the status area. If false, +present them to the user immediately. 0 diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index c69a54790..545fe679d 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -426,7 +426,7 @@ True 0 - What is your IRC nick? + What is your IRC nickname? 2 diff --git a/libempathy-gtk/empathy-log-window.ui b/libempathy-gtk/empathy-log-window.ui index 3220c18f4..5ce930095 100644 --- a/libempathy-gtk/empathy-log-window.ui +++ b/libempathy-gtk/empathy-log-window.ui @@ -123,7 +123,7 @@ - Find next + Find Next True False True @@ -140,7 +140,7 @@ - Find previous + Find Previous True False True diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index bcfe92e65..5e37532bf 100644 --- 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 579870f80..0ee1bbcc0 100644 --- 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 89c304bff..89673ee48 100644 --- 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, -- cgit v1.2.3