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 595215b1c86a541968ff3721b78d0d6ecd75eecd..636846ab6d392ccd884d90d95f4e64421e6bc1ff 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -2,6 +2,28 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="notification-daemon">
+                               <entry name="default_sound">
+                                       <local_schema short_desc="Vorgegebener Klang">
+                                               <longdesc>Die vorgegebene Klangdatei. Diese Einstellung wird überschrieben, wenn eine Anwendung die Hints »sound-file« oder »suppress-sound« verwendet. Leer lassen, wenn keine vorgegebene Klangdatei verwendet werden soll.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="sound_enabled">
+                                       <local_schema short_desc="Klang aktiviert">
+                                               <longdesc>Schaltet Klänge für Benachrichtigungen ein oder aus.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="theme">
+                                       <local_schema short_desc="Aktuelles Thema">
+                                               <longdesc>Das Thema um Benachrichtigungen anzuzeigen.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="popup_location">
+                                       <local_schema short_desc="Popup Position">
+                                               <longdesc>Vorgegebene Position auf der Arbeitsfläche für gestapelte Benachrichtigungen. Mögliche Werte: »top_left«, »top_right«, »bottom_left« und »bottom_right«</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="nautilus">
                                <dir name="desktop">
                                        <entry name="text_ellipsis_limit">
@@ -233,7 +255,6 @@
                                        </entry>
                                        <entry name="desktop_font">
                                                <local_schema short_desc="Schrift auf der Arbeitsfläche">
-                                                       <longdesc>Die von Symbolen auf der Arbeitsfläche zu verwendende Schriftbeschreibung.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="show_desktop">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 2d27ff147842a9f2d10ec4ff05d49273cf19f49b..1b3866aaeb909910d53325c624302419d6b04226 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -2,6 +2,28 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="notification-daemon">
+                               <entry name="default_sound">
+                                       <local_schema short_desc="Звук по умолчанию">
+                                               <longdesc>Звук, проигрываемый по умолчанию, если в уведомлении не указаны параметры «sound-file» или «suppress-sound». Чтобы отключить звук по умолчанию, оставьте поле пустым.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="sound_enabled">
+                                       <local_schema short_desc="Включить звук">
+                                               <longdesc>Включение и выключение поддержки звука в уведомлениях.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="theme">
+                                       <local_schema short_desc="Текущая тема">
+                                               <longdesc>Тема, используемая при отображении уведомлений.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="popup_location">
+                                       <local_schema short_desc="Положение всплывающего окна">
+                                               <longdesc>Положение по умолчанию для всплывающего окна при отображении уведомлений. Допустимые значения: &quot;top_left&quot;, &quot;top_right&quot;, &quot;bottom_left&quot; и &quot;bottom_right&quot;</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="nautilus">
                                <dir name="desktop">
                                        <entry name="text_ellipsis_limit">
@@ -233,7 +255,6 @@
                                        </entry>
                                        <entry name="desktop_font">
                                                <local_schema short_desc="Шрифт рабочего стола">
-                                                       <longdesc>Описание шрифта, использующегося для подписей к значкам на рабочем столе.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="show_desktop">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 74997cda15a1e9242fba4042940852ec7b7fb4e8..3462126b294d02f1952432c7f4b090c23c7e7d08 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <gconf>
        <dir name="apps">
+               <dir name="notification-daemon">
+                       <entry name="default_sound" mtime="1326696647" schema="/schemas/apps/notification-daemon/default_sound"/>
+                       <entry name="sound_enabled" mtime="1326696647" schema="/schemas/apps/notification-daemon/sound_enabled"/>
+                       <entry name="theme" mtime="1326696647" schema="/schemas/apps/notification-daemon/theme"/>
+                       <entry name="popup_location" mtime="1326696647" schema="/schemas/apps/notification-daemon/popup_location"/>
+               </dir>
                <dir name="gnome_settings_daemon">
                        <dir name="gtk-modules">
                                <entry name="canberra-gtk-module" mtime="1326696636" schema="/schemas/apps/gnome_settings_daemon/gtk-modules/canberra-gtk-module"/>
@@ -168,6 +174,38 @@
        </dir>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="notification-daemon">
+                               <entry name="default_sound" mtime="1326696647" type="schema" stype="string" owner="notification-daemon">
+                                       <local_schema locale="C" short_desc="Default Sound">
+                                               <default type="string">
+                                                       <stringvalue></stringvalue>
+                                               </default>
+                                               <longdesc>The default sound file used unless a notification supplies the &apos;sound-file&apos; or &apos;suppress-sound&apos; hint.  Leave empty for no default sound.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="sound_enabled" mtime="1326696647" type="schema" stype="bool" owner="notification-daemon">
+                                       <local_schema locale="C" short_desc="Sound Enabled">
+                                               <default type="bool" value="true"/>
+                                               <longdesc>Turns on and off sound support for notifications.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="theme" mtime="1326696647" type="schema" stype="string" owner="notification-daemon">
+                                       <local_schema locale="C" short_desc="Current theme">
+                                               <default type="string">
+                                                       <stringvalue>slider</stringvalue>
+                                               </default>
+                                               <longdesc>The theme used when displaying notifications.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="popup_location" mtime="1326696647" type="schema" stype="string" owner="notification-daemon">
+                                       <local_schema locale="C" short_desc="Popup location">
+                                               <default type="string">
+                                                       <stringvalue>top_right</stringvalue>
+                                               </default>
+                                               <longdesc>Default popup location on the workspace for stack notifications. Allowed values: &quot;top_left&quot;,&quot;top_right&quot;,&quot;bottom_left&quot; and &quot;bottom_right&quot;</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="gnome_settings_daemon">
                                <dir name="gtk-modules">
                                        <entry name="canberra-gtk-module" mtime="1326696636" type="schema" stype="bool" owner="libcanberra">