saving uncommitted changes in /etc prior to emerge run

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
index 6768f12691595b2be4ffd2b851831568c901ac9f..3ef0efa42b09b08017fd023b16b337723c865943 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -1141,6 +1141,11 @@ z.B. »Sans Italic 10«.</longdesc>
                                        </dir>
                                </dir>
                                <dir name="addressbook">
+                                       <entry name="gal_cache_interval">
+                                               <local_schema short_desc="Legt das Intervall fest, in dem der GAL-Zwischenspeicher aktualisiert werden soll.">
+                                                       <longdesc>Dieser Schlüssel legt die Anzahl an Tagen fest, die zwischen einzelnen Auffrischen des GAL-Speichers liegt. Setzen Sie diesen Wert auf 0, wenn GAL nicht aktualisiert werden soll und stattdessen den vorhandenen Zwischenspeicher zu verwenden. Dies wird nur funktionieren, wenn Sie den Offline-Speicher von GAL aktiviert haben.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <dir name="display">
                                                <entry name="show_preview">
                                                        <local_schema short_desc="Vorschaufeld anzeigen">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 48cb7009df95563800b8375e7cd5784438dfba28..484f782900cfeea792c9443393739ea2b2d59e3c 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -1140,6 +1140,11 @@
                                        </dir>
                                </dir>
                                <dir name="addressbook">
+                                       <entry name="gal_cache_interval">
+                                               <local_schema short_desc="Specifies the time interval to refresh the GAL Cache.">
+                                                       <longdesc>This key specifies the number of days&apos; interval between GAL cache refreshes. Set this value to zero if you don&apos;t want to update GAL and use the current cache forever. This will work only if you have enabled offline caching for GAL.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <dir name="display">
                                                <entry name="show_preview">
                                                        <local_schema short_desc="Show preview pane">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 186334bcfd38a5fe8938103a5cebd1a5996eb328..4b99c568b9c792c01c4f719ef4ae128929d589bc 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -1140,6 +1140,11 @@
                                        </dir>
                                </dir>
                                <dir name="addressbook">
+                                       <entry name="gal_cache_interval">
+                                               <local_schema short_desc="Устанавливает частоту обновления кэша GAL.">
+                                                       <longdesc>Этот ключ устанавливает частоту обновления кэша GAL в днях. Установите этот параметр в ноль, если не хотите обновлять GAL и собираетесь всегда использовать текущее состояние кэша. Это будет работать только в том случае, если вы разрешили автономное кэширование для GAL.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <dir name="display">
                                                <entry name="show_preview">
                                                        <local_schema short_desc="Показывать панель предварительного просмотра">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index 25bb54b1389b013fa34e705d816151811d9922a9..4504e2c860f9e132c4a9b8421a36ed576a845842 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -1172,6 +1172,10 @@
                                        </dir>
                                </dir>
                                <dir name="addressbook">
+                                       <entry name="gal_cache_interval">
+                                               <local_schema short_desc="Xác định khoảng thời gian giữa hai lần cập nhật Bộ nhớ tạm GAL.">
+                                               </local_schema>
+                                       </entry>
                                        <dir name="display">
                                                <entry name="show_preview">
                                                        <local_schema short_desc="Hiện ô Xem thử">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index a6745cda8313f410d743cfdf5d731bf05825bae0..f4397e4d1bcfa0cb0172dc1f3ed48cbead6f13c8 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -245,6 +245,7 @@
                                </dir>
                        </dir>
                        <dir name="addressbook">
+                               <entry name="gal_cache_interval" mtime="1326800522" schema="/schemas/apps/evolution/addressbook/gal_cache_interval"/>
                                <dir name="display">
                                        <entry name="show_preview" mtime="1326796986" schema="/schemas/apps/evolution/addressbook/display/show_preview"/>
                                        <entry name="vpane_position" mtime="1326796986" schema="/schemas/apps/evolution/addressbook/display/vpane_position"/>
@@ -2268,7 +2269,6 @@
                                        <entry name="autofs_friendly" mtime="1326800470" type="schema" stype="bool" owner="drivemount-applet">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="bool" value="false"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="mount_point" mtime="1326800470" type="schema" stype="string" owner="drivemount-applet">
@@ -2276,25 +2276,21 @@
                                                        <default type="string">
                                                                <stringvalue>/mnt/floppy</stringvalue>
                                                        </default>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="auto_eject" mtime="1326800470" type="schema" stype="bool" owner="drivemount-applet">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="bool" value="false"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="scale" mtime="1326800470" type="schema" stype="bool" owner="drivemount-applet">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="bool" value="false"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="pixmap" mtime="1326800470" type="schema" stype="int" owner="drivemount-applet">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="int" value="0"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="interval" mtime="1326800470" type="schema" stype="int" owner="drivemount-applet">
@@ -3967,6 +3963,15 @@
                                        </dir>
                                </dir>
                                <dir name="addressbook">
+                                       <entry name="gal_cache_interval" mtime="1326800522" type="schema" stype="int" owner="evolution-addressbook">
+                                               <local_schema locale="C" short_desc="Specifies the time interval to refresh the GAL Cache. ">
+                                                       <default type="int" value="7"/>
+                                                       <longdesc>This key specifies the number of days&apos; interval between
+       GAL cache refreshes. Set this value to zero if you don&apos;t want to
+       update GAL and use the current cache forever. This will work only if
+       you have enabled offline caching for GAL.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <dir name="display">
                                                <entry name="show_preview" mtime="1326796986" type="schema" stype="bool" owner="evolution-addressbook">
                                                        <local_schema locale="C" short_desc="Show preview pane">