From 3719711595f7d34286a520a4513f7318852e8f6a Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 19 Nov 2015 19:21:48 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- gconf/gconf.xml.defaults/%gconf-tree-de.xml | 12 +- gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 12 +- gconf/gconf.xml.defaults/%gconf-tree.xml | 206 ++++++++++---------- 3 files changed, 115 insertions(+), 115 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 521dff0..8b9d55b 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -8185,18 +8185,18 @@ z.B. »Sans Italic 10«. - - Aktivieren, wenn der Befehl, der benutzt wird um diese Art von URL zu verarbeiten, in einem Terminal ausgeführt werden soll. + + Falls dieser Schlüssel wahr ist, wird das Programm, dass diesen URL-Typ handhaben soll, in einem Terminal ausgeführt. - - Der Befehl, der „aim“-URLs verarbeitet, wenn aktiviert. + + Der zum Handhaben von »aim«-URLs verwendete Befehl, falls aktiviert. - - Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, „aim“-URLs verarbeiten soll. + + Falls dieser Schlüssel wahr ist, handhabt das in »command« angegebene Programm »aim«-URLs. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 179df63..5ee53e6 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -8179,18 +8179,18 @@ - - Верно, если команда, использующаяся для обращения по ссылке такого типа, должна быть запущена в терминале. + + Если этот ключ установлен, то программа,определённая для обработки ссылки (URL), будет запускаться в терминале. - - Команда, используемая для обработки "aim" URL, если включено. + + Команда, используемая для обработки URL типа "aim", если ключ установлен - - Верно, если команде, объявленной в ключе "command", нужно обращаться по "aim" адресам. + + Если этот ключ установлен, то программа, определённая в ключе "command", будет обрабатывать ссылки (URL) типа "aim". diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index ba7a250..b816ba0 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2258,30 +2258,30 @@ - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - + + @@ -16746,7 +16746,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16758,7 +16758,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16766,14 +16766,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati URL that provides proxy configuration values. - + The port on the machine defined by "/system/proxy/socks_host" that you proxy through. - + @@ -16781,14 +16781,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The machine name to proxy socks through. - + The port on the machine defined by "/system/proxy/ftp_host" that you proxy through. - + @@ -16796,14 +16796,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The machine name to proxy FTP through. - + The port on the machine defined by "/system/proxy/secure_host" that you proxy through. - + @@ -16811,7 +16811,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The machine name to proxy secure HTTP through. - + none @@ -16822,7 +16822,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16839,7 +16839,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati netmask (something like 192.168.0.0/24). - + @@ -16847,7 +16847,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Password to pass as authentication when doing HTTP proxying. - + @@ -16855,7 +16855,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati User name to pass as authentication when doing HTTP proxying. - + If true, then connections to the proxy server require @@ -16864,14 +16864,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "/system/http_proxy/authentication_password". - + The port on the machine defined by "/system/http_proxy/host" that you proxy through. - + @@ -16879,7 +16879,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The machine name to proxy HTTP through. - + Enables the proxy settings when accessing HTTP over the @@ -16888,7 +16888,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
    • - + @@ -16897,7 +16897,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati visible in the "network:///" location. - + merged @@ -21035,13 +21035,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + gnomemeeting -c %s @@ -21049,7 +21049,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "h323" URLs, if enabled. - + True if the command specified in the "command" key should handle "h323" URLs. @@ -21057,13 +21057,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + gnomemeeting -c %s @@ -21071,7 +21071,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "callto" URLs, if enabled. - + True if the command specified in the "command" key should handle "callto" URLs. @@ -21079,21 +21079,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + - purple-url-handler "%s" + gaim-remote uri "%s" The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. @@ -21101,13 +21101,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + evolution %s @@ -21115,7 +21115,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "mailto" URLs, if enabled. - + True if the command specified in the "command" key should handle "mailto" URLs. @@ -21123,13 +21123,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + epiphany %s @@ -21137,7 +21137,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "https" URLs, if enabled. - + True if the command specified in the "command" key should handle "https" URLs. @@ -21145,13 +21145,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + epiphany %s @@ -21159,7 +21159,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "http" URLs, if enabled. - + True if the command specified in the "command" key should handle "http" URLs. @@ -21167,13 +21167,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + gnome-help "%s" @@ -21181,7 +21181,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "man" URLs, if enabled. - + True if the command specified in the "command" key should handle "man" URLs. @@ -21189,13 +21189,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + gnome-help "%s" @@ -21203,7 +21203,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "info" URLs, if enabled. - + True if the command specified in the "command" key should handle "info" URLs. @@ -21211,13 +21211,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + gnome-help "%s" @@ -21225,7 +21225,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ghelp" URLs, if enabled. - + True if the command specified in the "command" key should handle "ghelp" URLs. @@ -21233,13 +21233,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + nautilus "%s" @@ -21247,7 +21247,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "trash" URLs, if enabled. - + True if the command specified in the "command" key should handle "trash" URLs. @@ -21403,7 +21403,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + nautilus %s @@ -21413,7 +21413,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + -x @@ -21421,7 +21421,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The exec argument to use for the default terminal application. - + gnome-terminal @@ -22363,54 +22363,54 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -22447,11 +22447,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - - + + -- 2.39.5