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 c112637fd89e9c7c7bd2d2b0ea58c291c73fc513..058d011a6ede80668a00af066d7577d580107d45 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -64,7 +64,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Voreingestellter Zeichensatz">
-                                                       <longdesc>Der voreingestellte Zeichensatz. Zulässige Werte: »armscii-8«, »Big5«, »Big5-HKSCS«, »EUC-JP«, »EUC-KR«, »gb18030«, »GB2312«, »geostd8«, »HZ-GB-2312«, »IBM850«, »IBM852«, »IBM855«, »IBM857«, »IBM862«, »IBM864«, »IBM866«, »ISO-2022-CN«, »ISO-2022-JP«, »ISO-2022-KR«, »ISO-8859-1«, »ISO-8859-2«, »ISO-8859-3«, »ISO-8859-4«, »ISO-8859-5«, »ISO-8859-6«, »ISO-8859-7«, »ISO-8859-8«, »ISO-8859-8-I«, ISO-8859-9«, »ISO-8859-10«, »ISO-8859-11«, »ISO-8859-13«, »ISO-8859-14«, »ISO-8859-15«, »ISO-8859-16«, »ISO-IR-111«, »KOI8-R«, »KOI8-U«, »Shift_JIS«, »TIS-620«, »UTF-7«, »UTF-8«, »VISCII«, »windows-874«, »windows-1250«, »windows-1251«, »windows-1252«, »windows-1253«, »windows-1254«, »windows-1255«, »windows-1256«, »windows-1257«, »windows-1258«, »x-euc-tw«, »x-gbk«, »x-johab«, »x-mac-arabic«, »x-mac-ce«, »x-mac-croatian«, »x-mac-cyrillic«, »x-mac-devanagari«, »x-mac-farsi«, »x-mac-greek«, »x-mac-gujarati«, »x-mac-gurmukhi«, »x-mac-hebrew«, »x-mac-icelandic«, »x-mac-roman«, »x-mac-romanian«, »x-mac-turkish«, »x-mac-ukrainian«, »x-user-defined«, »x-viet-tcvn5712«, »x-viet-vps« sowie »x-windows-949«.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -123,7 +122,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="Die momentan gewählte Schriftsprache">
-                                                       <longdesc>Die Sprache der momentan gewählten Schrift. Zulässige Werte: »ar« (Arabisch), »x-baltic« (Baltische Sprachen), »x-central-euro« (Zentraleuropäische Sprachen), »x-cyrillic« (im Kyrillischen Alphabet notierte Sprachen), »el« (Griechisch), »he« (Hebräisch), »ja« (Japanisch), »ko« (Koreanisch), »zh-CN« (Chinesisch, vereinfacht), »th« (Thai), »zh-TW« (Chinesisch, traditionell), »tr« (Türkisch), »x-unicode« (übrige Sprachen), »x-western« (In lateinischer Schrift notierte Sprachen), »x-tamil« (Tamil) sowie »x-devanagari« (Devanagari).</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 5d7a93aaed79f67910686f746cbec5b1c94b57e8..54cfb71586d455bb57e3587683694cf050e23093 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -64,7 +64,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Default encoding">
-                                                       <longdesc>Default encoding. Accepted values are: &quot;armscii-8&quot;, &quot;Big5&quot;, &quot;Big5-HKSCS&quot;, &quot;EUC-JP&quot;, &quot;EUC-KR&quot;, &quot;gb18030&quot;, &quot;GB2312&quot;, &quot;geostd8&quot;, &quot;HZ-GB-2312&quot;, &quot;IBM850&quot;, &quot;IBM852&quot;, &quot;IBM855&quot;, &quot;IBM857&quot;, &quot;IBM862&quot;, &quot;IBM864&quot;, &quot;IBM866&quot;, &quot;ISO-2022-CN&quot;, &quot;ISO-2022-JP&quot;, &quot;ISO-2022-KR&quot;, &quot;ISO-8859-1&quot;, &quot;ISO-8859-2&quot;, &quot;ISO-8859-3&quot;, &quot;ISO-8859-4&quot;, &quot;ISO-8859-5&quot;, &quot;ISO-8859-6&quot;, &quot;ISO-8859-7&quot;, &quot;ISO-8859-8&quot;, &quot;ISO-8859-8-I&quot;, &quot;ISO-8859-9&quot;, &quot;ISO-8859-10&quot;, &quot;ISO-8859-11&quot;, &quot;ISO-8859-13&quot;, &quot;ISO-8859-14&quot;, &quot;ISO-8859-15&quot;, &quot;ISO-8859-16&quot;, &quot;ISO-IR-111&quot;, &quot;KOI8-R&quot;, &quot;KOI8-U&quot;, &quot;Shift_JIS&quot;, &quot;TIS-620&quot;, &quot;UTF-7&quot;, &quot;UTF-8&quot;, &quot;VISCII&quot;, &quot;windows-874&quot;, &quot;windows-1250&quot;, &quot;windows-1251&quot;, &quot;windows-1252&quot;, &quot;windows-1253&quot;, &quot;windows-1254&quot;, &quot;windows-1255&quot;, &quot;windows-1256&quot;, &quot;windows-1257&quot;, &quot;windows-1258&quot;, &quot;x-euc-tw&quot;, &quot;x-gbk&quot;, &quot;x-johab&quot;, &quot;x-mac-arabic&quot;, &quot;x-mac-ce&quot;, &quot;x-mac-croatian&quot;, &quot;x-mac-cyrillic&quot;, &quot;x-mac-devanagari&quot;, &quot;x-mac-farsi&quot;, &quot;x-mac-greek&quot;, &quot;x-mac-gujarati&quot;, &quot;x-mac-gurmukhi&quot;, &quot;x-mac-hebrew&quot;, &quot;x-mac-icelandic&quot;, &quot;x-mac-roman&quot;, &quot;x-mac-romanian&quot;, &quot;x-mac-turkish&quot;, &quot;x-mac-ukrainian&quot;, &quot;x-user-defined&quot;, &quot;x-viet-tcvn5712&quot;, &quot;x-viet-vps&quot; and &quot;x-windows-949&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -123,7 +122,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="The currently-selected font language">
-                                                       <longdesc>The currently-selected font language. Values are &quot;ar&quot; (arabic), &quot;x-baltic&quot; (baltic languages), &quot;x-central-euro&quot; (central european languages), &quot;x-cyrillic&quot; (languages written with cyrillic alphabet), &quot;el&quot; (greek), &quot;he&quot; (hebrew), &quot;ja&quot; (japanese), &quot;ko&quot; (korean), &quot;zh-CN&quot; (simplified chinese), &quot;th&quot; (thai), &quot;zh-TW&quot; (traditional chinese), &quot;tr&quot; (turkish), &quot;x-unicode&quot; (other languages), &quot;x-western&quot; (languages written in latin script), &quot;x-tamil&quot; (tamil) and &quot;x-devanagari&quot; (devanagari).</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 08febf34e8eac5764181776b857bdee24a2ae04a..cb0bda85a361a2e2f6319a7e44146e64c9e30f2f 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -64,7 +64,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Кодировка по умолчанию">
-                                                       <longdesc>Кодировка по умолчанию. Допустимые значения: &quot;armscii-8&quot;, &quot;Big5&quot;, &quot;Big5-HKSCS&quot;, &quot;EUC-JP&quot;, &quot;EUC-KR&quot;, &quot;gb18030&quot;, &quot;GB2312&quot;, &quot;geostd8&quot;, &quot;HZ-GB-2312&quot;, &quot;IBM850&quot;, &quot;IBM852&quot;, &quot;IBM855&quot;, &quot;IBM857&quot;, &quot;IBM862&quot;, &quot;IBM864&quot;, &quot;IBM866&quot;, &quot;ISO-2022-CN&quot;, &quot;ISO-2022-JP&quot;, &quot;ISO-2022-KR&quot;, &quot;ISO-8859-1&quot;, &quot;ISO-8859-2&quot;, &quot;ISO-8859-3&quot;, &quot;ISO-8859-4&quot;, &quot;ISO-8859-5&quot;, &quot;ISO-8859-6&quot;, &quot;ISO-8859-7&quot;, &quot;ISO-8859-8&quot;, &quot;ISO-8859-8-I&quot;, &quot;ISO-8859-9&quot;, &quot;ISO-8859-10&quot;, &quot;ISO-8859-11&quot;, &quot;ISO-8859-13&quot;, &quot;ISO-8859-14&quot;, &quot;ISO-8859-15&quot;, &quot;ISO-8859-16&quot;, &quot;ISO-IR-111&quot;, &quot;KOI8-R&quot;, &quot;KOI8-U&quot;, &quot;Shift_JIS&quot;, &quot;TIS-620&quot;, &quot;UTF-7&quot;, &quot;UTF-8&quot;, &quot;VISCII&quot;, &quot;windows-874&quot;, &quot;windows-1250&quot;, &quot;windows-1251&quot;, &quot;windows-1252&quot;, &quot;windows-1253&quot;, &quot;windows-1254&quot;, &quot;windows-1255&quot;, &quot;windows-1256&quot;, &quot;windows-1257&quot;, &quot;windows-1258&quot;, &quot;x-euc-tw&quot;, &quot;x-gbk&quot;, &quot;x-johab&quot;, &quot;x-mac-arabic&quot;, &quot;x-mac-ce&quot;, &quot;x-mac-croatian&quot;, &quot;x-mac-cyrillic&quot;, &quot;x-mac-devanagari&quot;, &quot;x-mac-farsi&quot;, &quot;x-mac-greek&quot;, &quot;x-mac-gujarati&quot;, &quot;x-mac-gurmukhi&quot;, &quot;x-mac-hebrew&quot;, &quot;x-mac-icelandic&quot;, &quot;x-mac-roman&quot;, &quot;x-mac-romanian&quot;, &quot;x-mac-turkish&quot;, &quot;x-mac-ukrainian&quot;, &quot;x-user-defined&quot;, &quot;x-viet-tcvn5712&quot;, &quot;x-viet-vps&quot; и &quot;x-windows-949&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -123,7 +122,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="Выбранный на настоящий момент язык шрифтов">
-                                                       <longdesc>Выбранный на настоящий момент язык шрифтов. Допустимые значения &quot;ar&quot; (арабский), &quot;x-baltic&quot; (балтийские языки), &quot;x-central-euro&quot; (центрально-европейские языки) , &quot;x-cyrillic&quot; (языки, использующие кириллицу), &quot;el&quot; (греческий), &quot;he&quot; (еврейский), &quot;ja&quot; (японский), &quot;ko&quot; (корейский), &quot;zh-CN&quot; (китайский упрощённый), &quot;th&quot; (тайский), &quot;zh-TW&quot; (китайский традиционный), &quot;tr&quot; (турецкий), &quot;x-unicode&quot; (прочие языки), &quot;x-western&quot; (языки, использующие латиницу), &quot;x-tamil&quot; (тамильский) and &quot;x-devanagari&quot; (деванагари).</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 7f4db895df4903fd75fa7bccad2dd6de274bbdd6..5e94c4350906441650b781159766b852dade970a 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -939,8 +939,8 @@
                </dir>
                <dir name="gnome-session">
                        <dir name="options">
-                               <entry name="logout_prompt" mtime="1329422415" schema="/schemas/apps/gnome-session/options/logout_prompt"/>
-                               <entry name="auto_save_session" mtime="1329422415" schema="/schemas/apps/gnome-session/options/auto_save_session"/>
+                               <entry name="logout_prompt" mtime="1329683843" schema="/schemas/apps/gnome-session/options/logout_prompt"/>
+                               <entry name="auto_save_session" mtime="1329683843" schema="/schemas/apps/gnome-session/options/auto_save_session"/>
                        </dir>
                </dir>
                <dir name="netstatus_applet">
@@ -2086,13 +2086,13 @@
                                <entry name="dpi" mtime="1329422696" schema="/schemas/desktop/gnome/font_rendering/dpi"/>
                        </dir>
                        <dir name="session">
-                               <entry name="required_components_list" mtime="1329422415" schema="/schemas/desktop/gnome/session/required_components_list"/>
-                               <entry name="default_session" mtime="1329422415" schema="/schemas/desktop/gnome/session/default_session"/>
-                               <entry name="idle_delay" mtime="1329422415" schema="/schemas/desktop/gnome/session/idle_delay"/>
+                               <entry name="required_components_list" mtime="1329683843" schema="/schemas/desktop/gnome/session/required_components_list"/>
+                               <entry name="default_session" mtime="1329683843" schema="/schemas/desktop/gnome/session/default_session"/>
+                               <entry name="idle_delay" mtime="1329683843" schema="/schemas/desktop/gnome/session/idle_delay"/>
                                <dir name="required_components">
-                                       <entry name="filemanager" mtime="1329422415" schema="/schemas/desktop/gnome/session/required_components/filemanager"/>
-                                       <entry name="panel" mtime="1329422415" schema="/schemas/desktop/gnome/session/required_components/panel"/>
-                                       <entry name="windowmanager" mtime="1329422415" schema="/schemas/desktop/gnome/session/required_components/windowmanager"/>
+                                       <entry name="filemanager" mtime="1329683843" schema="/schemas/desktop/gnome/session/required_components/filemanager"/>
+                                       <entry name="panel" mtime="1329683843" schema="/schemas/desktop/gnome/session/required_components/panel"/>
+                                       <entry name="windowmanager" mtime="1329683843" schema="/schemas/desktop/gnome/session/required_components/windowmanager"/>
                                </dir>
                        </dir>
                        <dir name="remote_access">
@@ -2987,7 +2987,6 @@
                                        <entry name="inspector_enabled" mtime="1329683834" type="schema" stype="bool" owner="epiphany">
                                                <local_schema locale="C" short_desc="Enable Web Inspector">
                                                        <default type="bool" value="false"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="browse_with_caret" mtime="1329683834" type="schema" stype="bool" owner="epiphany">
@@ -3120,7 +3119,6 @@
                                        <entry name="warn_on_close_unsubmitted_data" mtime="1329683834" type="schema" stype="bool" owner="epiphany">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="bool" value="true"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="downloads_hidden" mtime="1329683834" type="schema" stype="bool" owner="epiphany">
@@ -3293,8 +3291,7 @@
                                                </local_schema>
                                        </entry>
                                        <entry name="middle_click_open_url" mtime="1329683834" type="schema" stype="bool" owner="epiphany">
-                                               <local_schema locale="C" short_desc="Middle click to open the web page pointed to by the currently
-       selected text">
+                                               <local_schema locale="C" short_desc="Middle click to open the web page pointed to by the currently  selected text">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Middle clicking on the main view pane will open the web page
        pointed to by the currently selected text.</longdesc>
@@ -8840,13 +8837,13 @@
                        </dir>
                        <dir name="gnome-session">
                                <dir name="options">
-                                       <entry name="logout_prompt" mtime="1329422415" type="schema" stype="bool" owner="gnome">
+                                       <entry name="logout_prompt" mtime="1329683843" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Logout prompt">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>If enabled, gnome-session will prompt the user before ending a session.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="auto_save_session" mtime="1329422415" type="schema" stype="bool" owner="gnome">
+                                       <entry name="auto_save_session" mtime="1329683843" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Save sessions">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>If enabled, gnome-session will save the session automatically.</longdesc>
@@ -16146,7 +16143,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="session">
-                                       <entry name="required_components_list" mtime="1329422415" type="schema" stype="list" owner="gnome" list_type="string">
+                                       <entry name="required_components_list" mtime="1329683843" type="schema" stype="list" owner="gnome" list_type="string">
                                                <local_schema locale="C" short_desc="Required session components">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -16162,7 +16159,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>List of components that are required as part of the session. (Each element names a key under &quot;/desktop/gnome/session/required_components&quot;). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default_session" mtime="1329422415" type="schema" stype="list" owner="gnome" list_type="string">
+                                       <entry name="default_session" mtime="1329683843" type="schema" stype="list" owner="gnome" list_type="string">
                                                <local_schema locale="C" short_desc="Default session">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -16172,7 +16169,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>List of applications that are part of the default session.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="idle_delay" mtime="1329422415" type="schema" stype="int" owner="gnome">
+                                       <entry name="idle_delay" mtime="1329683843" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="Time before session is considered idle">
                                                        <default type="int" value="5"/>
                                                        <longdesc>
@@ -16182,7 +16179,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <dir name="required_components">
-                                               <entry name="filemanager" mtime="1329422415" type="schema" stype="string" owner="gnome">
+                                               <entry name="filemanager" mtime="1329683843" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="File Manager">
                                                                <default type="string">
                                                                        <stringvalue>nautilus</stringvalue>
@@ -16190,7 +16187,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The file manager provides the desktop icons and allows you to interact with your saved files.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="panel" mtime="1329422415" type="schema" stype="string" owner="gnome">
+                                               <entry name="panel" mtime="1329683843" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Panel">
                                                                <default type="string">
                                                                        <stringvalue>gnome-panel</stringvalue>
@@ -16198,7 +16195,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="windowmanager" mtime="1329422415" type="schema" stype="string" owner="gnome">
+                                               <entry name="windowmanager" mtime="1329683843" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Window Manager">
                                                                <default type="string">
                                                                        <stringvalue>gnome-wm</stringvalue>