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 22429f7824d167d864bf520ea5df86d59252c5f5..6b67749137e92d48f08c1a72d4067398f1efb891 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -2,6 +2,13 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gconf-editor">
+                               <entry name="bookmarks">
+                                       <local_schema short_desc="Lesezeichen">
+                                               <longdesc>gconf-editor-Ordner-Lesezeichen</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="metacity">
                                <dir name="window_keybindings">
                                        <entry name="move_to_center">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 72dd50ab2d12871e48477adb5ab32d2c6ad863ec..b9dbffb25fa5c8629a74ae8f977789ec2ecaf571 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -2,6 +2,13 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gconf-editor">
+                               <entry name="bookmarks">
+                                       <local_schema short_desc="Bookmarks">
+                                               <longdesc>gconf-editor folder bookmarks</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="metacity">
                                <dir name="window_keybindings">
                                        <entry name="move_to_center">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 2508cab7662578d4a13ca0250c1c3b5e289d06aa..0ce8bd0cdc865d1b3e91c76d47147662cb3f0598 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -2,6 +2,13 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gconf-editor">
+                               <entry name="bookmarks">
+                                       <local_schema short_desc="Закладки">
+                                               <longdesc>Закладки папок gconf-editor</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="metacity">
                                <dir name="window_keybindings">
                                        <entry name="move_to_center">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index c37be828f49c636ae424b3c553dd1552c6b7602f..2c8773c11155548100df1e6083f633f9604ecddd 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -2,6 +2,13 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gconf-editor">
+                               <entry name="bookmarks">
+                                       <local_schema short_desc="Liên kết lưu">
+                                               <longdesc>Liên kết lưu thư mục gconf-editor</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="metacity">
                                <dir name="window_keybindings">
                                        <entry name="maximize_horizontally">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 57c2ab2b6d5f7d731dacbb2f1599c76c0a948909..873664c1093aca6eed552f701f7c28f80837def8 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <gconf>
        <dir name="apps">
+               <dir name="gconf-editor">
+                       <entry name="bookmarks" mtime="1326789283" schema="/schemas/apps/gconf-editor/bookmarks"/>
+               </dir>
                <dir name="metacity">
                        <dir name="window_keybindings">
                                <entry name="move_to_center" mtime="1326782763" schema="/schemas/apps/metacity/window_keybindings/move_to_center"/>
@@ -1157,6 +1160,15 @@
        </dir>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gconf-editor">
+                               <entry name="bookmarks" mtime="1326789283" type="schema" stype="list" owner="gconf-editor" list_type="string">
+                                       <local_schema locale="C" short_desc="Bookmarks">
+                                               <default type="list" ltype="string">
+                                               </default>
+                                               <longdesc>gconf-editor folder bookmarks</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="metacity">
                                <dir name="window_keybindings">
                                        <entry name="move_to_center" mtime="1326782763" type="schema" stype="string" owner="metacity">
@@ -1608,7 +1620,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        <entry name="command" mtime="1326782763" type="schema" stype="string" owner="metacity">
                                                <local_schema locale="C" short_desc="Commands to run in response to keybindings">
                                                        <default type="string">
-                                                               <stringvalue> </stringvalue>
+                                                               <stringvalue></stringvalue>
                                                        </default>
                                                        <longdesc>
          The /apps/metacity/global_keybindings/run_command_N 
@@ -2019,8 +2031,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                                <dir name="general">
                                        <entry name="disable_workarounds" mtime="1326782763" type="schema" stype="bool" owner="metacity">
-                                               <local_schema locale="C" short_desc="Disable misfeatures that are required by old or broken
-               applications">
+                                               <local_schema locale="C" short_desc="Disable misfeatures that are required by old or broken                applications">
                                                        <default type="bool" value="false"/>
                                                        <longdesc> 
           Some applications disregard specifications in ways that result in
@@ -2230,8 +2241,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <entry name="raise_on_click" mtime="1326782763" type="schema" stype="bool" owner="metacity">
-                                               <local_schema locale="C" short_desc="Whether raising should be a side-effect of other user
-                interactions">
+                                               <local_schema locale="C" short_desc="Whether raising should be a side-effect of other user                 interactions">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>
            Setting this option to false can lead to buggy behavior, so