From 3f9a13565557c57f74441442520ab02626c8c3da Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 26 Mar 2012 19:10:39 +0200
Subject: clean up failed rebasing and implement history timed expire check

---
 src/settings/settings_privacy.ui | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/settings/settings_privacy.ui')

diff --git a/src/settings/settings_privacy.ui b/src/settings/settings_privacy.ui
index 68245200..04f36bad 100644
--- a/src/settings/settings_privacy.ui
+++ b/src/settings/settings_privacy.ui
@@ -66,35 +66,35 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="kcfg_historyMaintainingPeriod">
+         <widget class="QComboBox" name="kcfg_expireHistory">
           <item>
            <property name="text">
-            <string>don't even store them</string>
+            <string>never</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>at application exit</string>
+            <string>every 3 months</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>every day</string>
+            <string>every month</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>every month</string>
+            <string>every day</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>every 3 months</string>
+            <string>at application exit</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>never</string>
+            <string>don't even store them</string>
            </property>
           </item>
          </widget>
-- 
cgit v1.2.1