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 0655dcb661c4eb83dfcf59acb649c5746aabd4c9..3e8f188fdea95b8471bf48526e921ec363ceb250 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -3,6 +3,55 @@
        <dir name="schemas">
                <dir name="apps">
                        <dir name="seahorse">
+                               <dir name="applet">
+                                       <entry name="display_decrypted_clipboard">
+                                               <local_schema short_desc="Nach dem Entschlüsseln die Zwischenablage anzeigen">
+                                                       <longdesc>Ergebnis in einem Fenster anzeigen, nachdem eine Entschlüsselungs- oder Überprüfungsoperation durchgeführt wurde</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="display_encrypted_clipboard">
+                                               <local_schema short_desc="Nach dem Verschlüsseln die Zwischenablage anzeigen">
+                                                       <longdesc>Ergebnistext in einem Fenster anzeigen, nachdem eine Verschlüsselungs- oder Signierungsoperation über das Applet durchgeführt wurde</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="show_clipboard_state">
+                                               <local_schema short_desc="Zeige den Status der Zwischenablage im Panel an">
+                                                       <longdesc>Status des Inhalts der Zwischenablage (verschlüsselt, signiert, etc …) durch das Symbol im Applet anzeigen.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                               <dir name="agent">
+                                       <entry name="cache_display">
+                                               <local_schema short_desc="Im Benachrichtigungsfeld ein Symbol zur Erinnerung von Zwischenspeicherungen anzeigen">
+                                                       <longdesc>Diesen Wert auf »TRUE« setzen, damit kein Symbol im Panel angezeigt wird,welches über den Status der Zwischenspeicherung informiert.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_authorize">
+                                               <local_schema short_desc="Nachfragen, bevor GPG-Passwörter aus dem Zwischenspeicher verwendet werden">
+                                                       <longdesc>Aktivieren Sie dies, damit »seahorse-agent« nachfragt, bevor zwischengespeicherte Passwörter ausgegeben werden.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_ttl">
+                                               <local_schema short_desc="Zeit (in Minuten), die die GPG-Passwörter im Zwischenspeicher abgelegt werden">
+                                                       <longdesc>Dies ist der Zeitraum (in Minuten), in dem die GPG-Passwörter im Seahorse-Dienst zwischengespeichert werden.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_expire">
+                                               <local_schema short_desc="Passwörter im Zwischenspeicher ablaufen lassen">
+                                                       <longdesc>Falls aktiviert, wird »seahorse-agent« GPG-Passwörter, die sich im Zwischenspeicher befinden, nach einer Frist ablaufen lassen.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_method">
+                                               <local_schema short_desc="Ort, an dem Passwörter zwischengespeichert werden">
+                                                       <longdesc>Wird dies auf »gnome« gesetzt, wird der Schlüsselbund benutzt, um Passwörter zwischenzuspeichern. Wird dies dagegen auf »internal« gesetzt, wird der interne Speicher benutzt.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_enabled">
+                                               <local_schema short_desc="Bestimmt, ob der Zwischenspeicher für GPG-Passwörter aktiviert ist.">
+                                                       <longdesc>Diese Einstellung aktiviert den Zwischenspeicher für Passwörter im »seahorse-agent«. Die »use-agent«-Einstellung in der Datei »gpg.conf« beeinflusst diese Einstellung.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
                                <dir name="listing">
                                        <entry name="sort_by">
                                                <local_schema short_desc="Spalte, nach der die Schlüssel sortiert werden">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 7862460705b5ca39ed9ff2077714017edf899806..cbdbdcd209afba16f8b1f9e5945be4f2febf20b0 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -3,6 +3,55 @@
        <dir name="schemas">
                <dir name="apps">
                        <dir name="seahorse">
+                               <dir name="applet">
+                                       <entry name="display_decrypted_clipboard">
+                                               <local_schema short_desc="Display clipboard after decrypting">
+                                                       <longdesc>After performing an decrypt or verify operation from the applet, display the resulting text in a window.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="display_encrypted_clipboard">
+                                               <local_schema short_desc="Display clipboard after encrypting">
+                                                       <longdesc>After performing an encrypt or signing operation from the applet, display the resulting text in a window.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="show_clipboard_state">
+                                               <local_schema short_desc="Show clipboard state in panel">
+                                                       <longdesc>Reflect the contents of the clipboard (whether encrypted, signed, etc...) in the panel applet icon.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                               <dir name="agent">
+                                       <entry name="cache_display">
+                                               <local_schema short_desc="Display cache reminder in the notification area">
+                                                       <longdesc>Set to &apos;true&apos; to enable display of the cache reminder in the notification area of your panel.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_authorize">
+                                               <local_schema short_desc="Prompt before using GPG passwords in cache">
+                                                       <longdesc>Set to &apos;true&apos; to have seahorse-agent prompt before giving out passwords it has cached.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_ttl">
+                                               <local_schema short_desc="The time (in minutes) to cache GPG passwords">
+                                                       <longdesc>This is the amount of time, specified in minutes, to cache GPG passwords in seahorse-agent.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_expire">
+                                               <local_schema short_desc="Expire passwords in the cache">
+                                                       <longdesc>When set, seahorse-agent expires GPG passwords in its cache after a period of time.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_method">
+                                               <local_schema short_desc="Where to store cached passwords.">
+                                                       <longdesc>If set to &apos;gnome&apos; uses gnome-keyring to cache passwords. When set to &apos;internal&apos; uses internal cache.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_enabled">
+                                               <local_schema short_desc="Whether the GPG password cache is enabled">
+                                                       <longdesc>This option enables the GPG password cache in the seahorse-agent program. The &apos;use-agent&apos; setting in gpg.conf affects this setting.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
                                <dir name="listing">
                                        <entry name="sort_by">
                                                <local_schema short_desc="The column to sort the seahorse keys by">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index b92358344914abf766b3db7d010c706e5c49e482..01060602e3499f731eb22bd032643c971e77770b 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -3,6 +3,55 @@
        <dir name="schemas">
                <dir name="apps">
                        <dir name="seahorse">
+                               <dir name="applet">
+                                       <entry name="display_decrypted_clipboard">
+                                               <local_schema short_desc="Показывать буфер обмена после расшифровки">
+                                                       <longdesc>После расшифровки или проверки подписи из апплета показывать результат во всплывающем окне.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="display_encrypted_clipboard">
+                                               <local_schema short_desc="Показывать буфер обмена после зашифровки">
+                                                       <longdesc>После зашифровки или подписывания из апплета показывать результат во всплывающем окне.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="show_clipboard_state">
+                                               <local_schema short_desc="Показывать на панели состояние буфера обмена">
+                                                       <longdesc>Отображать состояние буфера обмена (зашифровано, подписано и так далее) в значке апплета панели.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                               <dir name="agent">
+                                       <entry name="cache_display">
+                                               <local_schema short_desc="Показывать в области уведомлений напоминание о памяти паролей">
+                                                       <longdesc>Если установлено, то в области уведомления на панели будет напоминание о памяти паролей.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_authorize">
+                                               <local_schema short_desc="Спрашивать перед использованием паролей GPG из памяти">
+                                                       <longdesc>Если установлено, то seahorse-agent будет запрашивать подтверждение, прежде чем выдавать запомненные пароли.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_ttl">
+                                               <local_schema short_desc="Время хранения в памяти паролей GPG, в минутах">
+                                                       <longdesc>Время в минутах, в течение которого seahorse-agent хранит пароли GPG.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_expire">
+                                               <local_schema short_desc="Отмечать устаревшие пароли в памяти">
+                                                       <longdesc>Если установлено, seahorse-agent будет автоматически удалять запомненные пароли GPG по истечении промежутка времени.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_method">
+                                               <local_schema short_desc="Место для хранения запомненных паролей.">
+                                                       <longdesc>Если установлено в значение «gnome», то для запоминания паролей будет использоваться программа gnome-keyring. Если установлено в значение «internal», то будет использоваться внутренний кэш.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_enabled">
+                                               <local_schema short_desc="Запоминать ли пароли GPG">
+                                                       <longdesc>Этот параметр включает запоминание паролей GPG в памяти программы seahorse-agent. Параметр «use-agent» в файле gpg.conf также отвечает за эту настройку.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
                                <dir name="listing">
                                        <entry name="sort_by">
                                                <local_schema short_desc="Столбец для упорядочивания ключей Seahorse">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 121f4e954d572103d1b329bed9161680ff04ce70..6f409c5ba5fd7fd9b0aa94a2314ba35896024255 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2,6 +2,19 @@
 <gconf>
        <dir name="apps">
                <dir name="seahorse">
+                       <dir name="applet">
+                               <entry name="display_decrypted_clipboard" mtime="1326736551" schema="/schemas/apps/seahorse/applet/display_decrypted_clipboard"/>
+                               <entry name="display_encrypted_clipboard" mtime="1326736551" schema="/schemas/apps/seahorse/applet/display_encrypted_clipboard"/>
+                               <entry name="show_clipboard_state" mtime="1326736551" schema="/schemas/apps/seahorse/applet/show_clipboard_state"/>
+                       </dir>
+                       <dir name="agent">
+                               <entry name="cache_display" mtime="1326736551" schema="/schemas/apps/seahorse/agent/cache_display"/>
+                               <entry name="cache_authorize" mtime="1326736551" schema="/schemas/apps/seahorse/agent/cache_authorize"/>
+                               <entry name="cache_ttl" mtime="1326736551" schema="/schemas/apps/seahorse/agent/cache_ttl"/>
+                               <entry name="cache_expire" mtime="1326736551" schema="/schemas/apps/seahorse/agent/cache_expire"/>
+                               <entry name="cache_method" mtime="1326736551" schema="/schemas/apps/seahorse/agent/cache_method"/>
+                               <entry name="cache_enabled" mtime="1326736551" schema="/schemas/apps/seahorse/agent/cache_enabled"/>
+                       </dir>
                        <dir name="listing">
                                <entry name="sort_by" mtime="1326736304" schema="/schemas/apps/seahorse/listing/sort_by"/>
                                <entry name="show_type" mtime="1326736304" schema="/schemas/apps/seahorse/listing/show_type"/>
@@ -460,21 +473,21 @@
        </dir>
        <dir name="desktop">
                <dir name="pgp">
-                       <entry name="last_signer_openpgp" mtime="1326736304" schema="/schemas/desktop/pgp/last_signer"/>
-                       <entry name="last_signer_openssh" mtime="1326736304" schema="/schemas/desktop/pgp/last_signer"/>
-                       <entry name="encrypt_to_self" mtime="1326736304" schema="/schemas/desktop/pgp/encrypt_to_self"/>
-                       <entry name="default_key" mtime="1326736304" schema="/schemas/desktop/pgp/default_key"/>
-                       <entry name="ascii_armor" mtime="1326736304" schema="/schemas/desktop/pgp/ascii_armor"/>
+                       <entry name="last_signer_openpgp" mtime="1326736551" schema="/schemas/desktop/pgp/last_signer"/>
+                       <entry name="last_signer_openssh" mtime="1326736551" schema="/schemas/desktop/pgp/last_signer"/>
+                       <entry name="encrypt_to_self" mtime="1326736551" schema="/schemas/desktop/pgp/encrypt_to_self"/>
+                       <entry name="default_key" mtime="1326736551" schema="/schemas/desktop/pgp/default_key"/>
+                       <entry name="ascii_armor" mtime="1326736551" schema="/schemas/desktop/pgp/ascii_armor"/>
                        <dir name="keyservers">
                                <entry name="search_keyservers" mtime="1326736304" schema="/schemas/desktop/pgp/keyservers/search_keyservers"/>
                                <entry name="search_text" mtime="1326736304" schema="/schemas/desktop/pgp/keyservers/search_text"/>
                                <entry name="publish_to" mtime="1326736304" schema="/schemas/desktop/pgp/keyservers/publish_to"/>
                                <entry name="auto_sync" mtime="1326736304" schema="/schemas/desktop/pgp/keyservers/auto_sync"/>
                                <entry name="auto_retrieve" mtime="1326736304" schema="/schemas/desktop/pgp/keyservers/auto_retrieve"/>
-                               <entry name="all_keyservers" mtime="1326736304" schema="/schemas/desktop/pgp/keyservers/all_keyservers"/>
+                               <entry name="all_keyservers" mtime="1326736551" schema="/schemas/desktop/pgp/keyservers/all_keyservers"/>
                        </dir>
                        <dir name="recipients">
-                               <entry name="sort_by" mtime="1326736304" schema="/schemas/desktop/pgp/recipients/sort_by"/>
+                               <entry name="sort_by" mtime="1326736551" schema="/schemas/desktop/pgp/recipients/sort_by"/>
                        </dir>
                </dir>
                <dir name="gnome">
@@ -700,6 +713,76 @@
        <dir name="schemas">
                <dir name="apps">
                        <dir name="seahorse">
+                               <dir name="applet">
+                                       <entry name="display_decrypted_clipboard" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Display clipboard after decrypting">
+                                                       <default type="bool" value="false"/>
+                                                       <longdesc>After performing an decrypt or verify operation from the applet,
+                display the resulting text in a window.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="display_encrypted_clipboard" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Display clipboard after encrypting">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>After performing an encrypt or signing operation from the applet,
+                display the resulting text in a window.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="show_clipboard_state" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Show clipboard state in panel">
+                                                       <default type="bool" value="false"/>
+                                                       <longdesc>Reflect the contents of the clipboard (whether encrypted, 
+                signed, etc...) in the panel applet icon.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                               <dir name="agent">
+                                       <entry name="cache_display" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Display cache reminder in the notification area">
+                                                       <default type="bool" value="false"/>
+                                                       <longdesc>Set to &apos;true&apos; to enable display of the cache reminder in the
+                notification area of your panel.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_authorize" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Prompt before using GPG passwords in cache">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>Set to &apos;true&apos; to have seahorse-agent prompt before
+                               giving out passwords it has cached.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_ttl" mtime="1326736551" type="schema" stype="int" owner="seahorse">
+                                               <local_schema locale="C" short_desc="The time (in minutes) to cache GPG passwords">
+                                                       <default type="int" value="300"/>
+                                                       <longdesc>This is the amount of time, specified in minutes,
+                               to cache GPG passwords in seahorse-agent. </longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_expire" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Expire passwords in the cache">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>When set, seahorse-agent expires GPG passwords in 
+                               its cache after a period of time. </longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_method" mtime="1326736551" type="schema" stype="string" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Where to store cached passwords.">
+                                                       <default type="string">
+                                                               <stringvalue>internal</stringvalue>
+                                                       </default>
+                                                       <longdesc>If set to &apos;gnome&apos; uses gnome-keyring to cache passwords. 
+                When set to &apos;internal&apos; uses internal cache.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="cache_enabled" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
+                                               <local_schema locale="C" short_desc="Whether the GPG password cache is enabled">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>This option enables the GPG password cache in the 
+                               seahorse-agent program. The &apos;use-agent&apos; setting in gpg.conf
+                               affects this setting.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
                                <dir name="listing">
                                        <entry name="sort_by" mtime="1326736304" type="schema" stype="string" owner="seahorse">
                                                <local_schema locale="C" short_desc="The column to sort the seahorse keys by">
@@ -3394,7 +3477,7 @@
                </dir>
                <dir name="desktop">
                        <dir name="pgp">
-                               <entry name="last_signer" mtime="1326736304" type="schema" stype="string" owner="seahorse">
+                               <entry name="last_signer" mtime="1326736551" type="schema" stype="string" owner="seahorse">
                                        <local_schema locale="C" short_desc="Last key used to sign a message.">
                                                <default type="string">
                                                        <stringvalue></stringvalue>
@@ -3402,14 +3485,14 @@
                                                <longdesc>The ID of the last secret key used to sign a message.</longdesc>
                                        </local_schema>
                                </entry>
-                               <entry name="encrypt_to_self" mtime="1326736304" type="schema" stype="bool" owner="seahorse">
+                               <entry name="encrypt_to_self" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
                                        <local_schema locale="C" short_desc="Whether to always encrypt to default key">
                                                <default type="bool" value="false"/>
                                                <longdesc>If set to true, then the default key will
                                always be added to an encryption recipients list.</longdesc>
                                        </local_schema>
                                </entry>
-                               <entry name="default_key" mtime="1326736304" type="schema" stype="string" owner="seahorse">
+                               <entry name="default_key" mtime="1326736551" type="schema" stype="string" owner="seahorse">
                                        <local_schema locale="C" short_desc="ID of the default key">
                                                <default type="string">
                                                        <stringvalue></stringvalue>
@@ -3418,7 +3501,7 @@
                                certain operations, mainly signing.</longdesc>
                                        </local_schema>
                                </entry>
-                               <entry name="ascii_armor" mtime="1326736304" type="schema" stype="bool" owner="seahorse">
+                               <entry name="ascii_armor" mtime="1326736551" type="schema" stype="bool" owner="seahorse">
                                        <local_schema locale="C" short_desc="Whether to use ASCII Armor">
                                                <default type="bool" value="false"/>
                                                <longdesc>If set to true, then files encrypted with seahorse
@@ -3465,7 +3548,7 @@
                 servers.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="all_keyservers" mtime="1326736304" type="schema" stype="list" owner="seahorse" list_type="string">
+                                       <entry name="all_keyservers" mtime="1326736551" type="schema" stype="list" owner="seahorse" list_type="string">
                                                <local_schema locale="C" short_desc="PGP Key servers">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -3482,7 +3565,7 @@
                                        </entry>
                                </dir>
                                <dir name="recipients">
-                                       <entry name="sort_by" mtime="1326736304" type="schema" stype="string" owner="seahorse">
+                                       <entry name="sort_by" mtime="1326736551" type="schema" stype="string" owner="seahorse">
                                                <local_schema locale="C" short_desc="The column to sort the recipients by">
                                                        <default type="string">
                                                                <stringvalue>name</stringvalue>