From 2e3a3cf26e4d1894707703b15340529b8874466c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Thu, 15 Jan 2009 03:39:43 +0000
Subject: Merge revisions 37047:37074 from trunk.

svn path=/branches/kill-bonobo/; revision=37075
---
 calendar/gui/apps_evolution_calendar.schemas.in | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'calendar/gui/apps_evolution_calendar.schemas.in')

diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index bae4b65ba4..41bdca1b0e 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -15,6 +15,43 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_second_zone</key>
+      <applyto>/apps/evolution/calendar/display/day_second_zone</applyto>
+      <owner>evolution-calendar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>The second timezone for a Day View</short>
+        <long>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_second_zones</key>
+      <applyto>/apps/evolution/calendar/display/day_second_zones</applyto>
+      <owner>evolution-calendar</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[]</default>
+      <locale name="C">
+        <short>Recently used second time zones in a Day View</short>
+        <long>List of recently used second time zones in a Day View.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_second_zones_max</key>
+      <applyto>/apps/evolution/calendar/display/day_second_zones_max</applyto>
+      <owner>evolution-calendar</owner>
+      <type>int</type>
+      <default>5</default>
+      <locale name="C">
+        <short>Maximum number of recently used timezones to remember.</short>
+        <long>Maximum number of recently used timezones to remember in a 'day_second_zones' list.</long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/apps/evolution/calendar/display/use_daylight_saving</key>
       <applyto>/apps/evolution/calendar/display/use_daylight_saving</applyto>
-- 
cgit v1.2.3