Merge branch 'sasl'

[empathy.git] / src / empathy-preferences.ui

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index a383607aacd84f11a36aee16236da6d068bb8740..d221663204c58d7058a80181a73fa3c226aec786 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -2,19 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkDialog" id="preferences_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Preferences</property>
-    <property name="role">preferences</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">gtk-preferences</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox5">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -117,9 +104,24 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
+                           <child>
+                              <object class="GtkCheckButton" id="checkbutton_events_notif_area">
+                                <property name="label" translatable="yes">Display incoming events in the notification area</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="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_autoconnect">
-                                <property name="label" translatable="yes">Automatically _connect on startup </property>
+                                <property name="label" translatable="yes">_Automatically connect on startup</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -128,7 +130,21 @@
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
-                                <property name="position">1</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_logging">
+                                <property name="label" translatable="yes">Log conversations</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="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                           </object>
@@ -434,7 +450,7 @@
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="wrap">True</property>
-                                    <property name="label" translatable="yes">Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;).</property>
+                                    <property name="label" translatable="yes">Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place.</property>
                                     <attributes>
                                       <attribute name="scale" value="0.8"/>
                                     </attributes>
@@ -451,7 +467,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_location_reduce_accuracy">
-                                <property name="label" translatable="yes">_Reduce location accuracy</property>
+                                <property name="label" translatable="yes" comments="To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.">_Reduce location accuracy</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -501,7 +517,7 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_location_resource_gps">
-                                <property name="label" translatable="yes">Allow _GPS usage</property>
+                                <property name="label" translatable="yes">_GPS</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -516,7 +532,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_location_resource_cell">
-                                <property name="label" translatable="yes">Allow _cellphone usage</property>
+                                <property name="label" translatable="yes">_Cellphone</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -532,7 +548,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_location_resource_network">
-                                <property name="label" translatable="yes">Allow _network usage</property>
+                                <property name="label" translatable="yes">_Network (IP, Wi-Fi)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -553,7 +569,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Geoclue Settings</property>
+                        <property name="label" translatable="yes">Location sources:</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -793,40 +809,4 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_close">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">button_close</action-widget>
-    </action-widgets>
-  </object>
 </interface>