From: fbrehm Date: Mon, 20 Feb 2012 06:32:59 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=dee4391f294f5f21dc5e2bfa6740d0616640cf4b;p=config%2Fsamara%2Fetc.git 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 058d011..9f42075 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -3505,6 +3505,55 @@ z.B. »Sans Italic 10«. + + + + Ergebnis in einem Fenster anzeigen, nachdem eine Entschlüsselungs- oder Überprüfungsoperation durchgeführt wurde + + + + + Ergebnistext in einem Fenster anzeigen, nachdem eine Verschlüsselungs- oder Signierungsoperation über das Applet durchgeführt wurde + + + + + Status des Inhalts der Zwischenablage (verschlüsselt, signiert, etc …) durch das Symbol im Applet anzeigen. + + + + + + + Diesen Wert auf »TRUE« setzen, damit kein Symbol im Panel angezeigt wird,welches über den Status der Zwischenspeicherung informiert. + + + + + Aktivieren Sie dies, damit »seahorse-agent« nachfragt, bevor zwischengespeicherte Passwörter ausgegeben werden. + + + + + Dies ist der Zeitraum (in Minuten), in dem die GPG-Passwörter im Seahorse-Dienst zwischengespeichert werden. + + + + + Falls aktiviert, wird »seahorse-agent« GPG-Passwörter, die sich im Zwischenspeicher befinden, nach einer Frist ablaufen lassen. + + + + + 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. + + + + + Diese Einstellung aktiviert den Zwischenspeicher für Passwörter im »seahorse-agent«. Die »use-agent«-Einstellung in der Datei »gpg.conf« beeinflusst diese Einstellung. + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 54cfb71..f6c0c92 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -3504,6 +3504,55 @@ + + + + After performing an decrypt or verify operation from the applet, display the resulting text in a window. + + + + + After performing an encrypt or signing operation from the applet, display the resulting text in a window. + + + + + Reflect the contents of the clipboard (whether encrypted, signed, etc...) in the panel applet icon. + + + + + + + Set to 'true' to enable display of the cache reminder in the notification area of your panel. + + + + + Set to 'true' to have seahorse-agent prompt before giving out passwords it has cached. + + + + + This is the amount of time, specified in minutes, to cache GPG passwords in seahorse-agent. + + + + + When set, seahorse-agent expires GPG passwords in its cache after a period of time. + + + + + If set to 'gnome' uses gnome-keyring to cache passwords. When set to 'internal' uses internal cache. + + + + + This option enables the GPG password cache in the seahorse-agent program. The 'use-agent' setting in gpg.conf affects this setting. + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index cb0bda8..ede17a2 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -3504,6 +3504,55 @@ + + + + После расшифровки или проверки подписи из апплета показывать результат во всплывающем окне. + + + + + После зашифровки или подписывания из апплета показывать результат во всплывающем окне. + + + + + Отображать состояние буфера обмена (зашифровано, подписано и так далее) в значке апплета панели. + + + + + + + Если установлено, то в области уведомления на панели будет напоминание о памяти паролей. + + + + + Если установлено, то seahorse-agent будет запрашивать подтверждение, прежде чем выдавать запомненные пароли. + + + + + Время в минутах, в течение которого seahorse-agent хранит пароли GPG. + + + + + Если установлено, seahorse-agent будет автоматически удалять запомненные пароли GPG по истечении промежутка времени. + + + + + Если установлено в значение «gnome», то для запоминания паролей будет использоваться программа gnome-keyring. Если установлено в значение «internal», то будет использоваться внутренний кэш. + + + + + Этот параметр включает запоминание паролей GPG в памяти программы seahorse-agent. Параметр «use-agent» в файле gpg.conf также отвечает за эту настройку. + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index c096bbc..5e4abf4 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -947,6 +947,19 @@ + + + + + + + + + + + + + @@ -2038,21 +2051,21 @@ - - - - - + + + + + - + - + @@ -8886,6 +8899,76 @@ + + + + + After performing an decrypt or verify operation from the applet, + display the resulting text in a window. + + + + + + After performing an encrypt or signing operation from the applet, + display the resulting text in a window. + + + + + + Reflect the contents of the clipboard (whether encrypted, + signed, etc...) in the panel applet icon. + + + + + + + + Set to 'true' to enable display of the cache reminder in the + notification area of your panel. + + + + + + Set to 'true' to have seahorse-agent prompt before + giving out passwords it has cached. + + + + + + This is the amount of time, specified in minutes, + to cache GPG passwords in seahorse-agent. + + + + + + When set, seahorse-agent expires GPG passwords in + its cache after a period of time. + + + + + + internal + + If set to 'gnome' uses gnome-keyring to cache passwords. + When set to 'internal' uses internal cache. + + + + + + This option enables the GPG password cache in the + seahorse-agent program. The 'use-agent' setting in gpg.conf + affects this setting. + + + @@ -15811,7 +15894,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15819,14 +15902,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The ID of the last secret key used to sign a message. - + If set to true, then the default key will always be added to an encryption recipients list. - + @@ -15835,7 +15918,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati certain operations, mainly signing. - + If set to true, then files encrypted with seahorse @@ -15882,7 +15965,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati servers. - +
  • @@ -15899,7 +15982,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
    • - + name @@ -18206,13 +18289,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -18222,13 +18303,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - -     @@ -18238,13 +18317,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - -