Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-account-widget-yahoo.ui

diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index b40ad1b3b3f6cb9ed4c3cd54d44518fc63d1b84c..acc60de7471533b4ee3b90d27a3ab9412ab3b03d 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ b/libempathy-gtk/empathy-account-widget-yahoo.ui
@@ -108,17 +108,16 @@
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <object class="GtkTable" id="table_advanced_settings">
                 <property name="visible">True</property>
-                <property name="n_rows">6</property>
+                <property name="n_rows">5</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">12</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="checkbutton_ignore_invites">
-                    <property name="label" translatable="yes">_Ignore conference and chat room invitations</property>
+                    <property name="label" translatable="yes">I_gnore conference and chat room invitations</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -150,7 +149,7 @@
                   <object class="GtkLabel" id="label_charset">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes">Ch_aracter set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_charset</property>
                   </object>
@@ -246,23 +245,6 @@
                     <property name="y_options"></property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_yahoojp">
-                    <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>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <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>
               </object>
               <packing>
                 <property name="position">0</property>