empathy r1291 - in trunk: libempathy-gtk src
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r1291 - in trunk: libempathy-gtk src
- Date: Mon, 4 Aug 2008 11:15:08 +0000 (UTC)
Author: xclaesse
Date: Mon Aug 4 11:15:08 2008
New Revision: 1291
URL: http://svn.gnome.org/viewvc/empathy?rev=1291&view=rev
Log:
Fix translators complains about ambigous strings. Fixes bug #546154.
Modified:
trunk/libempathy-gtk/empathy-account-widget-sip.glade
trunk/libempathy-gtk/empathy-account-widget-yahoo.glade
trunk/libempathy-gtk/empathy-account-widget.c
trunk/src/empathy-accounts-dialog.glade
trunk/src/empathy-call-window.c
trunk/src/empathy-call-window.glade
trunk/src/empathy-event-manager.c
trunk/src/empathy-preferences.glade
trunk/src/empathy.c
Modified: trunk/libempathy-gtk/empathy-account-widget-sip.glade
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget-sip.glade (original)
+++ trunk/libempathy-gtk/empathy-account-widget-sip.glade Mon Aug 4 11:15:08 2008
@@ -15,6 +15,45 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
+ <widget class="GtkLabel" id="label_password">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Pass_word:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_password</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_userid">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_userid">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Username:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_password</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
@@ -51,45 +90,6 @@
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label_userid">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Username:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_password</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_userid">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_password">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Pass_word:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_password</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -113,39 +113,36 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_discover-stun">
+ <widget class="GtkEntry" id="entry_stun-server">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" comments="look up the DNS SRV record at the service's domain for the host name of a STUN server.">Discover STUN</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spinbutton_stun-port">
+ <widget class="GtkLabel" id="label_stun-port">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 65536 1 10 10</property>
- <property name="climb_rate">1</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">STUN port:</property>
+ <property name="mnemonic_widget">spinbutton_stun-port</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label_stun-server">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Stun Server:</property>
+ <property name="label" translatable="yes">STUN Server:</property>
<property name="mnemonic_widget">entry_stun-server</property>
</widget>
<packing>
@@ -156,29 +153,32 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stun-port">
+ <widget class="GtkSpinButton" id="spinbutton_stun-port">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Stun port:</property>
- <property name="mnemonic_widget">spinbutton_stun-port</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 65536 1 10 10</property>
+ <property name="climb_rate">1</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_stun-server">
+ <widget class="GtkCheckButton" id="checkbutton_discover-stun">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="label" translatable="yes" comments="look up the DNS SRV record at the service's domain for the host name of a STUN server.">Discover STUN</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
Modified: trunk/libempathy-gtk/empathy-account-widget-yahoo.glade
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget-yahoo.glade (original)
+++ trunk/libempathy-gtk/empathy-account-widget-yahoo.glade Mon Aug 4 11:15:08 2008
@@ -18,27 +18,40 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="entry_password">
+ <widget class="GtkLabel" id="label_password">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Pass_word:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_password</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_id">
+ <widget class="GtkButton" id="button_forget">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
+ <property name="response_id">0</property>
+ <child>
+ <widget class="GtkImage" id="image834">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -56,40 +69,27 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_forget">
+ <widget class="GtkEntry" id="entry_id">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
- <property name="response_id">0</property>
- <child>
- <widget class="GtkImage" id="image834">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
</widget>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_password">
+ <widget class="GtkEntry" id="entry_password">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Pass_word:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_password</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -109,181 +109,153 @@
<child>
<widget class="GtkTable" id="table_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">7</property>
+ <property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_yahoojp">
+ <widget class="GtkCheckButton" id="checkbutton_ignore_invites">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use _Yahoo Japan</property>
+ <property name="label" translatable="yes">_Ignore conference and chatroom invitations</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_serverjp">
+ <widget class="GtkLabel" id="label_locale">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Room List locale:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_locale</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_serverjp">
+ <widget class="GtkLabel" id="label_charset">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">J_apan server:</property>
+ <property name="label" translatable="yes">_Charset:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_serverjp</property>
+ <property name="mnemonic_widget">entry_charset</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spinbutton_port">
+ <widget class="GtkEntry" id="entry_locale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">5050 1 65556 1 10 10</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_server">
+ <widget class="GtkEntry" id="entry_charset">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_port">
+ <widget class="GtkLabel" id="label_server">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Port:</property>
+ <property name="label" translatable="yes">_Server:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">spinbutton_port</property>
+ <property name="mnemonic_widget">entry_server</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_server">
+ <widget class="GtkLabel" id="label_port">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Server:</property>
+ <property name="label" translatable="yes">_Port:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_server</property>
+ <property name="mnemonic_widget">spinbutton_port</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_charset">
+ <widget class="GtkEntry" id="entry_server">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_locale">
+ <widget class="GtkSpinButton" id="spinbutton_port">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="adjustment">5050 1 65556 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_charset">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Charset:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_charset</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_locale">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Room List locale:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_locale</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_ignore_invites">
+ <widget class="GtkCheckButton" id="checkbutton_yahoojp">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Ignore conference and chatroom invitations</property>
+ <property name="label" translatable="yes">Use _Yahoo Japan</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
Modified: trunk/libempathy-gtk/empathy-account-widget.c
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget.c (original)
+++ trunk/libempathy-gtk/empathy-account-widget.c Mon Aug 4 11:15:08 2008
@@ -693,7 +693,6 @@
"entry_id", "account",
"entry_password", "password",
"entry_server", "server",
- "entry_serverjp", "serverjp",
"entry_locale", "room-list-locale",
"entry_charset", "charset",
"spinbutton_port", "port",
Modified: trunk/src/empathy-accounts-dialog.glade
==============================================================================
--- trunk/src/empathy-accounts-dialog.glade (original)
+++ trunk/src/empathy-accounts-dialog.glade Mon Aug 4 11:15:08 2008
@@ -302,7 +302,7 @@
<child>
<widget class="GtkLabel" id="label_no_account_blurb">
<property name="visible">True</property>
- <property name="label" translatable="yes">To add a new account, you can click on the 'Add' button and a new entry will be created for you to started configuring.
+ <property name="label">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.</property>
<property name="use_markup">True</property>
Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c (original)
+++ trunk/src/empathy-call-window.c Mon Aug 4 11:15:08 2008
@@ -376,6 +376,8 @@
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);
Modified: trunk/src/empathy-call-window.glade
==============================================================================
--- trunk/src/empathy-call-window.glade (original)
+++ trunk/src/empathy-call-window.glade Mon Aug 4 11:15:08 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.2 on Thu May 1 23:37:49 2008 -->
+<!--Generated with glade3 3.4.5 on Mon Aug 4 11:04:43 2008 -->
<glade-interface>
<widget class="GtkWindow" id="window">
<child>
@@ -72,180 +72,180 @@
<property name="n_columns">3</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkButton" id="button_1">
+ <widget class="GtkButton" id="button_hash">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">1</property>
+ <property name="label" translatable="yes">#</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_2">
+ <widget class="GtkButton" id="button_0">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">2</property>
+ <property name="label" translatable="yes">0</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_3">
+ <widget class="GtkButton" id="button_asterisk">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">3</property>
+ <property name="label" translatable="yes">*</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_4">
+ <widget class="GtkButton" id="button_9">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">4</property>
+ <property name="label" translatable="yes">9</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_5">
+ <widget class="GtkButton" id="button_8">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">5</property>
+ <property name="label" translatable="yes">8</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_6">
+ <widget class="GtkButton" id="button_7">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">6</property>
+ <property name="label" translatable="yes">7</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_7">
+ <widget class="GtkButton" id="button_6">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">7</property>
+ <property name="label" translatable="yes">6</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_8">
+ <widget class="GtkButton" id="button_5">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">8</property>
+ <property name="label" translatable="yes">5</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_9">
+ <widget class="GtkButton" id="button_4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">9</property>
+ <property name="label" translatable="yes">4</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_asterisk">
+ <widget class="GtkButton" id="button_3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">*</property>
+ <property name="label" translatable="yes">3</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_0">
+ <widget class="GtkButton" id="button_2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">0</property>
+ <property name="label" translatable="yes">2</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_hash">
+ <widget class="GtkButton" id="button_1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">#</property>
+ <property name="label" translatable="yes">1</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -254,7 +254,7 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Keypad</b></property>
+ <property name="label" translatable="yes" comments="To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone"><b>Keypad</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c (original)
+++ trunk/src/empathy-event-manager.c Mon Aug 4 11:15:08 2008
@@ -235,6 +235,10 @@
}
}
+#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 @@
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 @@
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));
}
Modified: trunk/src/empathy-preferences.glade
==============================================================================
--- trunk/src/empathy-preferences.glade (original)
+++ trunk/src/empathy-preferences.glade Mon Aug 4 11:15:08 2008
@@ -309,7 +309,7 @@
<child>
<widget class="GtkLabel" id="label613">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Audio</b></property>
+ <property name="label" translatable="yes" comments="To translators: Audio notifications preferences"><b>Audio</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -347,7 +347,7 @@
<child>
<widget class="GtkLabel" id="label614">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Visual</b></property>
+ <property name="label" translatable="yes" comments="To translators: Visual notifications preferences, like notify bubbles, etc."><b>Visual</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c (original)
+++ trunk/src/empathy.c Mon Aug 4 11:15:08 2008
@@ -123,46 +123,46 @@
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
