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 3f271d7b4680cb5adb1140c5aebfe01533ff6351..abd9aa1f77e3853b1cf216414cb8a878f50a0a44 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -4653,6 +4653,23 @@
                                        </entry>
                                </dir>
                                <dir name="url-handlers">
+                                       <dir name="webcal">
+                                               <entry name="need-terminal">
+                                                       <local_schema short_desc="Programm im Terminal ausführen">
+                                                               <longdesc>Falls dieser Schlüssel wahr ist, wird das Programm, das diese URL handhaben soll, in einem Terminal ausgeführt.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="command">
+                                                       <local_schema short_desc="URL-Handler für Webcal-URIs">
+                                                               <longdesc>URL-Handler für Webcal-URIs</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enabled">
+                                                       <local_schema short_desc="webcal-URLs handhaben">
+                                                               <longdesc>Falls dieser Schlüssel wahr ist, handhabt das in »command« angegebene Programm webcal-URLs.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="vnc">
                                                <entry name="command">
                                                        <local_schema short_desc="Die genutzte Anwendung für »vnc://«-Adressen">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 36176ac1899d5f1d9fe75a6fbd20beff8e8d2bf5..96c62eb4f92345a48a30e061497613e8a24e6648 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -4611,6 +4611,23 @@
                                        </entry>
                                </dir>
                                <dir name="url-handlers">
+                                       <dir name="webcal">
+                                               <entry name="need-terminal">
+                                                       <local_schema short_desc="Run program in terminal">
+                                                               <longdesc>True if the program to handle this URL should be run in a terminal</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="command">
+                                                       <local_schema short_desc="URL handler for webcal URIs">
+                                                               <longdesc>URL handler for webcal URIs</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enabled">
+                                                       <local_schema short_desc="How to handle webcal URLs">
+                                                               <longdesc>Set to true to have a program specified in command handle webcal URLs</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="vnc">
                                                <entry name="command">
                                                        <local_schema short_desc="The handler for &quot;vnc://&quot; URLs">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 37b258eb6f8ac43691c290d3ee1c2a9355c250a0..1570ec2cd9b29bfc7eb9a778fbe1e52d3df29490 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -4596,6 +4596,23 @@
                                        </entry>
                                </dir>
                                <dir name="url-handlers">
+                                       <dir name="webcal">
+                                               <entry name="need-terminal">
+                                                       <local_schema short_desc="Запускать программу в терминале">
+                                                               <longdesc>Если установлен, программа-обработчик этого типа ссылок будет запускаться в терминале</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="command">
+                                                       <local_schema short_desc="Обработчик URL для URI webcal">
+                                                               <longdesc>Обработчик URL для URI webcal</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enabled">
+                                                       <local_schema short_desc="Как обрабатывать URL webcal">
+                                                               <longdesc>Если установлен, для обработки URL webcal будет использоваться программа, указанная в ключе command</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="vnc">
                                                <entry name="command">
                                                        <local_schema short_desc="Обработчик для URL вида «vnc://»">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index 154b95db43c05e8151d6303c094d66919eecad75..da998e53142ed9208e665a853bb4a56ddea18b2e 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -4143,6 +4143,18 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để 
                                        </entry>
                                </dir>
                                <dir name="url-handlers">
+                                       <dir name="webcal">
+                                               <entry name="need-terminal">
+                                                       <local_schema short_desc="Chạy trên dòng lệnh">
+                                                               <longdesc>True (đúng) nếu chương trình xử lý URL này cần chạy trên dòng lệnh</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enabled">
+                                                       <local_schema short_desc="Cách xử lý URL webcal">
+                                                               <longdesc>Đặt là true (đúng) để xác định chương trình trong địa chỉ URL lệnh xử lý webcal</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="vnc">
                                                <entry name="command">
                                                        <local_schema short_desc="Bộ thao tác các địa chỉ URL kiểu « vnc:// »">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 293c2fe2c6533d2dcfa1b77eb37eeec49eaeec7e..120958c6b26f2e5682059b6b9f0ac0f5effb6062 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1570,6 +1570,11 @@
                                <entry name="show_hidden_files" mtime="1326727624" schema="/schemas/desktop/gnome/file_views/show_hidden_files"/>
                        </dir>
                        <dir name="url-handlers">
+                               <dir name="webcal">
+                                       <entry name="need-terminal" mtime="1326795150" schema="/schemas/desktop/gnome/url-handlers/webcal/need-terminal"/>
+                                       <entry name="command" mtime="1326795150" schema="/schemas/desktop/gnome/url-handlers/webcal/command"/>
+                                       <entry name="enabled" mtime="1326795150" schema="/schemas/desktop/gnome/url-handlers/webcal/enabled"/>
+                               </dir>
                                <dir name="vnc">
                                        <entry name="enabled" mtime="1326792465" schema="/schemas/desktop/gnome/url-handlers/vnc/enabled"/>
                                        <entry name="needs_terminal" mtime="1326792465" schema="/schemas/desktop/gnome/url-handlers/vnc/needs_terminal"/>
@@ -11486,6 +11491,28 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="url-handlers">
+                                       <dir name="webcal">
+                                               <entry name="need-terminal" mtime="1326795150" type="schema" stype="bool" owner="evolution-webcal">
+                                                       <local_schema locale="C" short_desc="Run program in terminal">
+                                                               <default type="bool" value="false"/>
+                                                               <longdesc>True if the program to handle this URL should be run in a terminal</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="command" mtime="1326795150" type="schema" stype="string" owner="evolution-webcal">
+                                                       <local_schema locale="C" short_desc="URL handler for webcal URIs">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/libexec/evolution-webcal %s</stringvalue>
+                                                               </default>
+                                                               <longdesc>URL handler for webcal URIs</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enabled" mtime="1326795150" type="schema" stype="bool" owner="evolution-webcal">
+                                                       <local_schema locale="C" short_desc="How to handle webcal URLs">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc>Set to true to have a program specified in command handle webcal URLs</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="vnc">
                                                <entry name="enabled" mtime="1326792465" type="schema" stype="bool" owner="vinagre">
                                                        <local_schema locale="C" short_desc="">