From 37214503f6b3f40eb3e01e7a654f16bfc9f3e59e Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 26 Oct 2016 01:49:56 +0200 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-vi.xml | 10 +- gconf/gconf.xml.defaults/%gconf-tree.xml | 206 ++++++++++---------- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 8ea3f745..5c864245 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -8043,18 +8043,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 62031b2c..d0201a15 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -7985,18 +7985,18 @@ - - Верно, если команда, использующаяся для обращения по ссылке такого типа, должна быть запущена в терминале. + + Если этот ключ установлен, то программа,определённая для обработки ссылки (URL), будет запускаться в терминале. - - Команда, используемая для обработки "aim" URL, если включено. + + Команда, используемая для обработки URL типа "aim", если ключ установлен - - Верно, если команде, объявленной в ключе "command", нужно обращаться по "aim" адресам. + + Если этот ключ установлен, то программа, определённая в ключе "command", будет обрабатывать ссылки (URL) типа "aim". diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index 55d6f667..3ed96a54 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml @@ -7177,17 +7177,17 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để - Đúng nếu lệnh được dùng để quản lý địa chỉ URL kiểu này nên được chạy trong thiết bị cuối. + Đúng nếu lệnh được dùng để xử lý URL kiểu này nên được dùng trong thiết bị cuối. - - Lệnh dùng để quản lý địa chỉ URL « aim », nếu bật. + + Lệnh được dùng để xử lý các URL kiểu « aim », nếu bật. - - Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « aim ». + + Đúng nếu lệnh được xác định trong khóa « lệnh » nên xử lý các URL « aim ». diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 426c07a3..371b0759 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -3046,54 +3046,54 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3130,11 +3130,11 @@ - + - - + + @@ -20703,13 +20703,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 @@ -20717,7 +20717,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. @@ -20725,13 +20725,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 @@ -20739,7 +20739,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. @@ -20747,21 +20747,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. @@ -20769,13 +20769,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 @@ -20783,7 +20783,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. @@ -20791,13 +20791,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 @@ -20805,7 +20805,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. @@ -20813,13 +20813,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 @@ -20827,7 +20827,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. @@ -20835,13 +20835,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" @@ -20849,7 +20849,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. @@ -20857,13 +20857,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" @@ -20871,7 +20871,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. @@ -20879,13 +20879,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" @@ -20893,7 +20893,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. @@ -20901,13 +20901,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" @@ -20915,7 +20915,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. @@ -21071,7 +21071,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + nautilus %s @@ -21081,7 +21081,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + -x @@ -21089,7 +21089,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 @@ -21889,7 +21889,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -21901,7 +21901,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -21909,14 +21909,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. - + @@ -21924,14 +21924,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. - + @@ -21939,14 +21939,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. - + @@ -21954,7 +21954,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The machine name to proxy secure HTTP through. - + none @@ -21965,7 +21965,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -21982,7 +21982,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati netmask (something like 192.168.0.0/24). - + @@ -21990,7 +21990,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Password to pass as authentication when doing HTTP proxying. - + @@ -21998,7 +21998,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 @@ -22007,14 +22007,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. - + @@ -22022,7 +22022,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 @@ -22031,7 +22031,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
    • - + @@ -22040,7 +22040,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati visible in the "network:///" location. - + merged @@ -22126,30 +22126,30 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - + + -- 2.39.5