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 6d8b2e03f8a0d08cc156909181d28a254e631e36..058d011a6ede80668a00af066d7577d580107d45 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -1844,7 +1844,6 @@
                                </entry>
                                <entry name="subtitle_encoding">
                                        <local_schema short_desc="Untertitelkodierung">
-                                               <longdesc>Zeichenkodierung für Untertitel</longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="subtitle_font">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 74189e352129cb7cfb392299b4dbd4a7f97adf32..54cfb71586d455bb57e3587683694cf050e23093 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -1844,7 +1844,6 @@
                                </entry>
                                <entry name="subtitle_encoding">
                                        <local_schema short_desc="Subtitle encoding">
-                                               <longdesc>Encoding charset for subtitle</longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="subtitle_font">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index becbf9c7f9b9097de8aa700ba795696a09e03c9a..cb0bda85a361a2e2f6319a7e44146e64c9e30f2f 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -1844,7 +1844,6 @@
                                </entry>
                                <entry name="subtitle_encoding">
                                        <local_schema short_desc="Кодировка субтитров">
-                                               <longdesc>Кодировка символов для субтитров</longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="subtitle_font">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 21e610ef93f3b390b437e04cc9e87e92ae97b686..94a19e9959234bb369f4044da9d35628489cb998 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1075,35 +1075,35 @@
                </dir>
                <dir name="eog">
                        <dir name="plugins">
-                               <entry name="active_plugins" mtime="1329422108" schema="/schemas/apps/eog/plugins/active_plugins"/>
+                               <entry name="active_plugins" mtime="1329683800" schema="/schemas/apps/eog/plugins/active_plugins"/>
                        </dir>
                        <dir name="ui">
-                               <entry name="propsdialog_netbook_mode" mtime="1329422108" schema="/schemas/apps/eog/ui/propsdialog_netbook_mode"/>
-                               <entry name="filechooser_xdg_fallback" mtime="1329422108" schema="/schemas/apps/eog/ui/filechooser_xdg_fallback"/>
-                               <entry name="disable_trash_confirmation" mtime="1329422108" schema="/schemas/apps/eog/ui/disable_trash_confirmation"/>
-                               <entry name="scroll_buttons" mtime="1329422108" schema="/schemas/apps/eog/ui/scroll_buttons"/>
-                               <entry name="sidebar" mtime="1329422108" schema="/schemas/apps/eog/ui/sidebar"/>
-                               <entry name="image_collection_resizable" mtime="1329422108" schema="/schemas/apps/eog/ui/image_collection_resizable"/>
-                               <entry name="image_collection_position" mtime="1329422108" schema="/schemas/apps/eog/ui/image_collection_position"/>
-                               <entry name="image_collection" mtime="1329422108" schema="/schemas/apps/eog/ui/image_collection"/>
-                               <entry name="statusbar" mtime="1329422108" schema="/schemas/apps/eog/ui/statusbar"/>
-                               <entry name="toolbar" mtime="1329422108" schema="/schemas/apps/eog/ui/toolbar"/>
+                               <entry name="propsdialog_netbook_mode" mtime="1329683800" schema="/schemas/apps/eog/ui/propsdialog_netbook_mode"/>
+                               <entry name="filechooser_xdg_fallback" mtime="1329683800" schema="/schemas/apps/eog/ui/filechooser_xdg_fallback"/>
+                               <entry name="disable_trash_confirmation" mtime="1329683800" schema="/schemas/apps/eog/ui/disable_trash_confirmation"/>
+                               <entry name="scroll_buttons" mtime="1329683800" schema="/schemas/apps/eog/ui/scroll_buttons"/>
+                               <entry name="sidebar" mtime="1329683800" schema="/schemas/apps/eog/ui/sidebar"/>
+                               <entry name="image_collection_resizable" mtime="1329683800" schema="/schemas/apps/eog/ui/image_collection_resizable"/>
+                               <entry name="image_collection_position" mtime="1329683800" schema="/schemas/apps/eog/ui/image_collection_position"/>
+                               <entry name="image_collection" mtime="1329683800" schema="/schemas/apps/eog/ui/image_collection"/>
+                               <entry name="statusbar" mtime="1329683800" schema="/schemas/apps/eog/ui/statusbar"/>
+                               <entry name="toolbar" mtime="1329683800" schema="/schemas/apps/eog/ui/toolbar"/>
                        </dir>
                        <dir name="full_screen">
-                               <entry name="seconds" mtime="1329422108" schema="/schemas/apps/eog/full_screen/seconds"/>
-                               <entry name="upscale" mtime="1329422108" schema="/schemas/apps/eog/full_screen/upscale"/>
-                               <entry name="loop" mtime="1329422108" schema="/schemas/apps/eog/full_screen/loop"/>
+                               <entry name="seconds" mtime="1329683800" schema="/schemas/apps/eog/full_screen/seconds"/>
+                               <entry name="upscale" mtime="1329683800" schema="/schemas/apps/eog/full_screen/upscale"/>
+                               <entry name="loop" mtime="1329683800" schema="/schemas/apps/eog/full_screen/loop"/>
                        </dir>
                        <dir name="view">
-                               <entry name="trans_color" mtime="1329422108" schema="/schemas/apps/eog/view/trans_color"/>
-                               <entry name="zoom_multiplier" mtime="1329422108" schema="/schemas/apps/eog/view/zoom_multiplier"/>
-                               <entry name="scroll_wheel_zoom" mtime="1329422108" schema="/schemas/apps/eog/view/scroll_wheel_zoom"/>
-                               <entry name="transparency" mtime="1329422108" schema="/schemas/apps/eog/view/transparency"/>
-                               <entry name="extrapolate" mtime="1329422108" schema="/schemas/apps/eog/view/extrapolate"/>
-                               <entry name="interpolate" mtime="1329422108" schema="/schemas/apps/eog/view/interpolate"/>
-                               <entry name="use-background-color" mtime="1329422108" schema="/schemas/apps/eog/view/use-background-color"/>
-                               <entry name="background-color" mtime="1329422108" schema="/schemas/apps/eog/view/background-color"/>
-                               <entry name="autorotate" mtime="1329422108" schema="/schemas/apps/eog/view/autorotate"/>
+                               <entry name="trans_color" mtime="1329683800" schema="/schemas/apps/eog/view/trans_color"/>
+                               <entry name="zoom_multiplier" mtime="1329683800" schema="/schemas/apps/eog/view/zoom_multiplier"/>
+                               <entry name="scroll_wheel_zoom" mtime="1329683800" schema="/schemas/apps/eog/view/scroll_wheel_zoom"/>
+                               <entry name="transparency" mtime="1329683800" schema="/schemas/apps/eog/view/transparency"/>
+                               <entry name="extrapolate" mtime="1329683800" schema="/schemas/apps/eog/view/extrapolate"/>
+                               <entry name="interpolate" mtime="1329683800" schema="/schemas/apps/eog/view/interpolate"/>
+                               <entry name="use-background-color" mtime="1329683800" schema="/schemas/apps/eog/view/use-background-color"/>
+                               <entry name="background-color" mtime="1329683800" schema="/schemas/apps/eog/view/background-color"/>
+                               <entry name="autorotate" mtime="1329683800" schema="/schemas/apps/eog/view/autorotate"/>
                        </dir>
                </dir>
                <dir name="bug-buddy">
@@ -9523,7 +9523,7 @@
                        </dir>
                        <dir name="eog">
                                <dir name="plugins">
-                                       <entry name="active_plugins" mtime="1329422108" type="schema" stype="list" owner="eog" list_type="string">
+                                       <entry name="active_plugins" mtime="1329683800" type="schema" stype="list" owner="eog" list_type="string">
                                                <local_schema locale="C" short_desc="Active plugins">
                                                        <default type="list" ltype="string">
                                                        </default>
@@ -9533,7 +9533,7 @@
                                        </entry>
                                </dir>
                                <dir name="ui">
-                                       <entry name="propsdialog_netbook_mode" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="propsdialog_netbook_mode" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Whether the metadata list in the properties dialog should have its own page.">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>If activated, the detailed metadata list in the properties dialog
@@ -9542,13 +9542,13 @@
        the widget will be embedded on the &quot;Metadata&quot; page.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="filechooser_xdg_fallback" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="filechooser_xdg_fallback" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Whether the file chooser should show the user&apos;s pictures folder if no images are loaded.">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>If activated and no image is loaded in the active window, the file chooser will display the user&apos;s pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_trash_confirmation" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="disable_trash_confirmation" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Trash images without asking">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>If activated, Eye of GNOME won&apos;t ask for confirmation when
@@ -9556,44 +9556,45 @@
        cannot be moved to the trash and would be deleted instead.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="scroll_buttons" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="scroll_buttons" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Show/Hide the image collection pane scroll buttons.">
                                                        <default type="bool" value="true"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="sidebar" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="sidebar" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Show/Hide the window side pane.">
                                                        <default type="bool" value="true"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="image_collection_resizable" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="image_collection_resizable" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Whether the image collection pane should be resizable.">
                                                        <default type="bool" value="false"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="image_collection_position" mtime="1329422108" type="schema" stype="int" owner="eog">
-                                               <local_schema locale="C" short_desc="Image collection pane position. Set to 0 for bottom;          1 for left; 2 for top; 3 for right.">
+                                       <entry name="image_collection_position" mtime="1329683800" type="schema" stype="int" owner="eog">
+                                               <local_schema locale="C" short_desc="Image collection pane position. Set to 0 for bottom; 
+        1 for left; 2 for top; 3 for right.">
                                                        <default type="int" value="0"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="image_collection" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="image_collection" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Show/Hide the image collection pane.">
                                                        <default type="bool" value="false"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="statusbar" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="statusbar" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Show/Hide the window statusbar.">
                                                        <default type="bool" value="true"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="toolbar" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="toolbar" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Show/Hide the window toolbar.">
                                                        <default type="bool" value="true"/>
                                                </local_schema>
                                        </entry>
                                </dir>
                                <dir name="full_screen">
-                                       <entry name="seconds" mtime="1329422108" type="schema" stype="int" owner="eog">
+                                       <entry name="seconds" mtime="1329683800" type="schema" stype="int" owner="eog">
                                                <local_schema locale="C" short_desc="Delay in seconds until showing the next image">
                                                        <default type="int" value="5"/>
                                                        <longdesc>A value greater than 0 determines the seconds an image stays
@@ -9601,14 +9602,14 @@
         disables the automatic browsing.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="upscale" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="upscale" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Allow zoom greater than 100% initially">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>If this is set to FALSE small images will not be
         stretched to fit into the screen initially.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="loop" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="loop" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Loop through the image sequence">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the sequence of images should be shown in an
@@ -9617,7 +9618,7 @@
                                        </entry>
                                </dir>
                                <dir name="view">
-                                       <entry name="trans_color" mtime="1329422108" type="schema" stype="string" owner="eog">
+                                       <entry name="trans_color" mtime="1329683800" type="schema" stype="string" owner="eog">
                                                <local_schema locale="C" short_desc="Transparency color">
                                                        <default type="string">
                                                                <stringvalue>#000000</stringvalue>
@@ -9627,7 +9628,7 @@
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="zoom_multiplier" mtime="1329422108" type="schema" stype="float" owner="eog">
+                                       <entry name="zoom_multiplier" mtime="1329683800" type="schema" stype="float" owner="eog">
                                                <local_schema locale="C" short_desc="Zoom multiplier">
                                                        <default type="float" value="0.050000000000000003"/>
                                                        <longdesc>The multiplier to be applied when using the mouse scroll wheel 
@@ -9636,13 +9637,13 @@
        scroll event and 1.00 result in a 100% zoom increment.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="scroll_wheel_zoom" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="scroll_wheel_zoom" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Scroll wheel zoom">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the scroll wheel should be used for zooming.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="transparency" mtime="1329422108" type="schema" stype="string" owner="eog">
+                                       <entry name="transparency" mtime="1329683800" type="schema" stype="string" owner="eog">
                                                <local_schema locale="C" short_desc="Transparency indicator">
                                                        <default type="string">
                                                                <stringvalue>CHECK_PATTERN</stringvalue>
@@ -9653,7 +9654,7 @@
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="extrapolate" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="extrapolate" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Extrapolate Image">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the image should be extrapolated on zoom-in.
@@ -9661,7 +9662,7 @@
         non-extrapolated images.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="interpolate" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="interpolate" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Interpolate Image">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the image should be interpolated on zoom-out.
@@ -9669,13 +9670,13 @@
         non-interpolated images.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use-background-color" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="use-background-color" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Use a custom background color">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="background-color" mtime="1329422108" type="schema" stype="string" owner="eog">
+                                       <entry name="background-color" mtime="1329683800" type="schema" stype="string" owner="eog">
                                                <local_schema locale="C" short_desc="Background Color">
                                                        <default type="string">
                                                                <stringvalue>#000000</stringvalue>
@@ -9685,7 +9686,7 @@
         by the active GTK+ theme instead.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="autorotate" mtime="1329422108" type="schema" stype="bool" owner="eog">
+                                       <entry name="autorotate" mtime="1329683800" type="schema" stype="bool" owner="eog">
                                                <local_schema locale="C" short_desc="Automatic orientation">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the image should be rotated automatically based on