Merge branch 'sasl'

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

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index e39d36d8ab3b30a486178643ebc223e44d40010b..d221663204c58d7058a80181a73fa3c226aec786 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -104,6 +104,21 @@
                                 <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>
@@ -115,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>
@@ -438,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>