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 ce397420cf246807f74eb1b491b11547161e7110..3f271d7b4680cb5adb1140c5aebfe01533ff6351 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -4622,6 +4622,18 @@
                                                        <longdesc>Sollen alle externen Programme zum Erzeugen von Miniatur-Vorschaubildern deaktiviert werden, unabhängig davon, ob sie anderweitig aktiviert wurden?</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="application@x-shockwave-flash">
+                                               <entry name="command">
+                                                       <local_schema short_desc="Befehl für Vorschaubilder von Flash-Dateien">
+                                                               <longdesc>Gültiger Befehl und Argumente für das Flash-Datei-Vorschauwerkzeug. Schauen Sie für mehr Informationen in der Dokumentation der Vorschaufunktion von Nautilus nach.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable">
+                                                       <local_schema short_desc="Vorschaubilder von Flash-Dateien einschalten">
+                                                               <longdesc>Erzeugen von Vorschaubilder aktivieren.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="file_views">
                                        <entry name="tabs_open_position">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 4fa5d712646c2f5871daa921481f409944486d36..36176ac1899d5f1d9fe75a6fbd20beff8e8d2bf5 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -4580,6 +4580,18 @@
                                                        <longdesc>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="application@x-shockwave-flash">
+                                               <entry name="command">
+                                                       <local_schema short_desc="Thumbnail command for Flash files">
+                                                               <longdesc>Valid command plus arguments for the Flash file thumbnailer. See nautilus thumbnailer documentation for more information.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable">
+                                                       <local_schema short_desc="Enable thumbnailing of Flash files">
+                                                               <longdesc>Enable the creation of new thumbnails.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="file_views">
                                        <entry name="tabs_open_position">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 3c0a187de90b3834582d134274671de41f4e24c5..37b258eb6f8ac43691c290d3ee1c2a9355c250a0 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -4565,6 +4565,18 @@
                                                        <longdesc>Установите этот ключ, чтобы отключить все внешние программы миниатюризации, независимо от того, включены они или отключены другими способами.</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="application@x-shockwave-flash">
+                                               <entry name="command">
+                                                       <local_schema short_desc="Команда для создания миниатюр из файлов Flash">
+                                                               <longdesc>Команда и параметры для программы создания миниатюр. Смотрите документацию по создателю миниатюр для Nautilus для получения подробной информации.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable">
+                                                       <local_schema short_desc="Включить создание миниатюр файлов Flash">
+                                                               <longdesc>Включить создание новых миниатюр</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="file_views">
                                        <entry name="tabs_open_position">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index 4f9b8e86b7e41da6b3abc028d4e836bb2836a1dc..154b95db43c05e8151d6303c094d66919eecad75 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -4112,6 +4112,18 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để 
                                                        <longdesc>Đặt Đúng (true) để vô hiệu hoá mọi trình hiển ảnh thu nhỏ bên ngoài, không cần biết chúng có bị vô hiệu hoá hay không.</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="application@x-shockwave-flash">
+                                               <entry name="command">
+                                                       <local_schema short_desc="Lệnh tạo ảnh mẫu cho tập tin Flash">
+                                                               <longdesc>Lệnh hợp lệ cộng đối số cho tập tin trình tạo ảnh mẫu cho Flash. Xem tài liệu nautilus thumbnailer để biết thêm chi tiết.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable">
+                                                       <local_schema short_desc="Bật tạo ảnh mẫu cho tập tin Flash">
+                                                               <longdesc>Bật tạo ảnh mẫu.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="file_views">
                                        <entry name="tabs_open_position">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index d9affe1c585dca05a2a053a69c3323a13bd66fb8..113bfa7d69814ae8967df256588d7c62169d590b 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1551,6 +1551,10 @@
                        </dir>
                        <dir name="thumbnailers">
                                <entry name="disable_all" mtime="1326727479" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
+                               <dir name="application@x-shockwave-flash">
+                                       <entry name="command" mtime="1326794693" schema="/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash/command"/>
+                                       <entry name="enable" mtime="1326794693" schema="/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash/enable"/>
+                               </dir>
                        </dir>
                        <dir name="file_views">
                                <entry name="icon_theme" mtime="1326727479" schema="/schemas/desktop/gnome/file-views/icon_theme"/>
@@ -1716,8 +1720,7 @@
                                                </local_schema>
                                        </entry>
                                        <entry name="image_collection_position" mtime="1326793880" 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.">
+                                               <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>
@@ -11388,6 +11391,22 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="application@x-shockwave-flash">
+                                               <entry name="command" mtime="1326794693" type="schema" stype="string" owner="swfdec-thumbnailer">
+                                                       <local_schema locale="C" short_desc="Thumbnail command for Flash files">
+                                                               <default type="string">
+                                                                       <stringvalue>swfdec-thumbnailer -s %s %i %o</stringvalue>
+                                                               </default>
+                                                               <longdesc>Valid command plus arguments for the Flash file thumbnailer. See nautilus thumbnailer documentation for more information.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1326794693" type="schema" stype="bool" owner="swfdec-thumbnailer">
+                                                       <local_schema locale="C" short_desc="Enable thumbnailing of Flash files">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc>Enable the creation of new thumbnails.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="file_views">
                                        <entry name="tabs_open_position" mtime="1326727624" type="schema" stype="string" owner="nautilus">