From edde6162b4294a97bac8b09dc88ea806b2330a53 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 4 Aug 2008 11:15:08 +0000 Subject: [PATCH] Fix translators complains about ambigous strings. Fixes bug #546154. svn path=/trunk/; revision=1291 --- .../empathy-account-widget-sip.glade | 126 ++++++------- .../empathy-account-widget-yahoo.glade | 172 ++++++++---------- libempathy-gtk/empathy-account-widget.c | 1 - src/empathy-accounts-dialog.glade | 2 +- src/empathy-call-window.c | 2 + src/empathy-call-window.glade | 104 +++++------ src/empathy-event-manager.c | 12 +- src/empathy-preferences.glade | 4 +- src/empathy.c | 28 +-- 9 files changed, 212 insertions(+), 239 deletions(-) diff --git a/libempathy-gtk/empathy-account-widget-sip.glade b/libempathy-gtk/empathy-account-widget-sip.glade index 0baf7b59..d427ccc3 100644 --- a/libempathy-gtk/empathy-account-widget-sip.glade +++ b/libempathy-gtk/empathy-account-widget-sip.glade @@ -14,6 +14,45 @@ 2 12 6 + + + True + 0 + Pass_word: + True + entry_password + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + True + 0 + _Username: + True + entry_password + + + GTK_FILL + + + True @@ -51,45 +90,6 @@ - - - True - 0 - _Username: - True - entry_password - - - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - 0 - Pass_word: - True - entry_password - - - 1 - 2 - GTK_FILL - - - False @@ -113,39 +113,36 @@ 6 6 - + True True - Discover STUN - True - 0 - True + 1 2 - GTK_FILL - + 1 + 2 - + True - True - 0 0 65536 1 10 10 - 1 + 0 + STUN port: + spinbutton_stun-port - 1 - 2 2 3 + GTK_FILL + True 0 - Stun Server: + STUN Server: entry_stun-server @@ -156,29 +153,32 @@ - + True - 0 - Stun port: - spinbutton_stun-port + True + 0 0 65536 1 10 10 + 1 + 1 + 2 2 3 - GTK_FILL - - + True True + Discover STUN + True + 0 + True - 1 2 - 1 - 2 + GTK_FILL + diff --git a/libempathy-gtk/empathy-account-widget-yahoo.glade b/libempathy-gtk/empathy-account-widget-yahoo.glade index ad4df08d..6e63cb78 100644 --- a/libempathy-gtk/empathy-account-widget-yahoo.glade +++ b/libempathy-gtk/empathy-account-widget-yahoo.glade @@ -18,27 +18,40 @@ 12 6 - + True - True - False + 0 + Pass_word: + True + entry_password - 1 - 2 1 2 + GTK_FILL - + True True + Forget password and clear the entry. + 0 + + + True + gtk-clear + 1 + + - 1 + 2 3 + 1 + 2 + GTK_FILL @@ -56,40 +69,27 @@ - + True True - Forget password and clear the entry. - 0 - - - True - gtk-clear - 1 - - - 2 + 1 3 - 1 - 2 - GTK_FILL - + True - 0 - Pass_word: - True - entry_password + True + False + 1 + 2 1 2 - GTK_FILL @@ -109,181 +109,153 @@ True - 7 + 6 2 12 6 - + True True - Use _Yahoo Japan + _Ignore conference and chatroom invitations True 0 True 2 - 5 - 6 GTK_FILL - + True - True + 0 + _Room List locale: + True + entry_locale - 1 - 2 - 6 - 7 + 1 + 2 + GTK_FILL - + True 0 - J_apan server: + _Charset: True - entry_serverjp + entry_charset - 6 - 7 + 2 + 3 GTK_FILL - + True True - 5050 1 65556 1 10 10 - 1 - True 1 2 - 4 - 5 + 1 + 2 - + True True 1 2 - 3 - 4 + 2 + 3 - + True 0 - _Port: + _Server: True - spinbutton_port + entry_server - 4 - 5 + 3 + 4 GTK_FILL - + True 0 - _Server: + _Port: True - entry_server + spinbutton_port - 3 - 4 + 4 + 5 GTK_FILL - + True True 1 2 - 2 - 3 + 3 + 4 - + True True + 5050 1 65556 1 10 10 + 1 + True 1 2 - 1 - 2 - - - - - - True - 0 - _Charset: - True - entry_charset - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - _Room List locale: - True - entry_locale - - - 1 - 2 - GTK_FILL + 4 + 5 - + True True - _Ignore conference and chatroom invitations + Use _Yahoo Japan True 0 True 2 + 5 + 6 GTK_FILL diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index cf01f899..6fe5e020 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -693,7 +693,6 @@ empathy_account_widget_yahoo_new (McAccount *account) "entry_id", "account", "entry_password", "password", "entry_server", "server", - "entry_serverjp", "serverjp", "entry_locale", "room-list-locale", "entry_charset", "charset", "spinbutton_port", "port", diff --git a/src/empathy-accounts-dialog.glade b/src/empathy-accounts-dialog.glade index 4d7b32ed..0367cf46 100644 --- a/src/empathy-accounts-dialog.glade +++ b/src/empathy-accounts-dialog.glade @@ -302,7 +302,7 @@ True - To add a new account, you can click on the 'Add' button and a new entry will be created for you to started configuring. + To add a new account, you can click on the 'Add' button and a new entry will be created for you to started configuring. If you do not want to add an account, simply click on the account you want to configure in the list on the left. True diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 441d698b..0de46265 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -376,6 +376,8 @@ call_window_update (EmpathyCallWindow *window) if (window->status == EMPATHY_TP_CALL_STATUS_READYING) { gtk_window_set_title (GTK_WINDOW (window->window), _("Empathy Call")); + /* To translators: Readying is the first state of the call, it is + * preparing the connection and it does not yet ring. */ gtk_label_set_text (GTK_LABEL (window->status_label), _("Readying")); gtk_widget_set_sensitive (window->video_button, FALSE); gtk_widget_set_sensitive (window->output_volume_button, FALSE); diff --git a/src/empathy-call-window.glade b/src/empathy-call-window.glade index 684aed3c..fd48f879 100644 --- a/src/empathy-call-window.glade +++ b/src/empathy-call-window.glade @@ -1,6 +1,6 @@ - + @@ -72,180 +72,180 @@ 3 True - + True True - 1 + # True 0 + 2 + 3 + 3 + 4 - + True True - 2 + 0 True 0 1 2 + 3 + 4 - + True True - 3 + * True 0 - 2 - 3 + 3 + 4 - + True True - 4 + 9 True 0 - 1 - 2 + 2 + 3 + 2 + 3 - + True True - 5 + 8 True 0 1 2 - 1 - 2 + 2 + 3 - + True True - 6 + 7 True 0 - 2 - 3 - 1 - 2 + 2 + 3 - + True True - 7 + 6 True 0 - 2 - 3 + 2 + 3 + 1 + 2 - + True True - 8 + 5 True 0 1 2 - 2 - 3 + 1 + 2 - + True True - 9 + 4 True 0 - 2 - 3 - 2 - 3 + 1 + 2 - + True True - * + 3 True 0 - 3 - 4 + 2 + 3 - + True True - 0 + 2 True 0 1 2 - 3 - 4 - + True True - # + 1 True 0 - 2 - 3 - 3 - 4 @@ -254,7 +254,7 @@ True - <b>Keypad</b> + <b>Keypad</b> True diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 0404f5d7..618706f1 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -235,6 +235,10 @@ event_manager_dispatch_channel_cb (EmpathyDispatcher *dispatcher, } } +#define TUBE_NO_APP_MESSAGE _("%s is offering you an invitation, but " \ + "you don't have the needed external " \ + "application to handle it.") + static void event_tube_process_func (EventPriv *event) { @@ -248,9 +252,7 @@ event_tube_process_func (EventPriv *event) gchar *str; /* Tell the user that the tube can't be handled */ - str = g_strdup_printf (_("%s offered you an invitation, but " - "you don't have the needed external " - "application to handle it."), + str = g_strdup_printf (TUBE_NO_APP_MESSAGE, empathy_contact_get_name (tube->initiator)); dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, @@ -289,9 +291,7 @@ event_manager_filter_tube_cb (EmpathyDispatcher *dispatcher, empathy_contact_get_name (tube->initiator)); } else { icon_name = GTK_STOCK_DIALOG_ERROR; - msg = g_strdup_printf (_("%s is offering you an invitation, but " - "you don't have the needed external " - "application to handle it."), + msg = g_strdup_printf (TUBE_NO_APP_MESSAGE, empathy_contact_get_name (tube->initiator)); } diff --git a/src/empathy-preferences.glade b/src/empathy-preferences.glade index 11a3a2a7..784bdef2 100644 --- a/src/empathy-preferences.glade +++ b/src/empathy-preferences.glade @@ -309,7 +309,7 @@ True - <b>Audio</b> + <b>Audio</b> True @@ -347,7 +347,7 @@ True - <b>Visual</b> + <b>Visual</b> True diff --git a/src/empathy.c b/src/empathy.c index 926b6af0..a14873f3 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -123,46 +123,46 @@ operation_error_cb (MissionControl *mc, switch (error_code) { case MC_DISCONNECTED_ERROR: - message = _("Disconnected"); + message = "Disconnected"; break; case MC_INVALID_HANDLE_ERROR: - message = _("Invalid handle"); + message = "Invalid handle"; break; case MC_NO_MATCHING_CONNECTION_ERROR: - message = _("No matching connection"); + message = "No matching connection"; break; case MC_INVALID_ACCOUNT_ERROR: - message = _("Invalid account"); + message = "Invalid account"; break; case MC_PRESENCE_FAILURE_ERROR: - message = _("Presence failure"); + message = "Presence failure"; break; case MC_NO_ACCOUNTS_ERROR: - message = _("No accounts"); + message = "No accounts"; break; case MC_NETWORK_ERROR: - message = _("Network error"); + message = "Network error"; break; case MC_CONTACT_DOES_NOT_SUPPORT_VOICE_ERROR: - message = _("Contact does not support voice"); + message = "Contact does not support voice"; break; case MC_LOWMEM_ERROR: - message = _("Lowmem"); + message = "Lowmem"; break; case MC_CHANNEL_REQUEST_GENERIC_ERROR: - message = _("Channel request generic error"); + message = "Channel request generic error"; break; case MC_CHANNEL_BANNED_ERROR: - message = _("Channel banned"); + message = "Channel banned"; break; case MC_CHANNEL_FULL_ERROR: - message = _("Channel full"); + message = "Channel full"; break; case MC_CHANNEL_INVITE_ONLY_ERROR: - message = _("Channel invite only"); + message = "Channel invite only"; break; default: - message = _("Unknown error code"); + message = "Unknown error code"; } DEBUG ("Error during operation %d: %s", operation_id, message); -- 2.39.2