From 48b37358570e1b5f8cb557ca118593b0e84ed47d Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 16 Jan 2012 17:05:55 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- gconf/gconf.xml.defaults/%gconf-tree-de.xml | 9 +- .../gconf.xml.defaults/%gconf-tree-en_GB.xml | 9 +- gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 9 +- gconf/gconf.xml.defaults/%gconf-tree-vi.xml | 9 +- gconf/gconf.xml.defaults/%gconf-tree.xml | 213 +++++++++--------- 5 files changed, 122 insertions(+), 127 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 8335ba10..018d6845 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -255,7 +255,6 @@ - Die von Symbolen auf der Arbeitsfläche zu verwendende Schriftbeschreibung. @@ -1104,13 +1103,13 @@ - - Das zum Ausführen von Programmen im Terminal verwendete, vom Schlüssel »exec« festgelegte Argument. + + Das an die Vorgabe-Terminal-Anwendung zu übergebende exec-Argument. - - Zu verwendende Terminal-Anwendung beim Starten von Anwendungen, die ein Terminal benötigen. + + Die Vorgabe-Terminal-Anwendung, die für Anwendungen verwendet wird, die ein Terminal erforderlich machen. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index c753f51c..11bebb41 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -233,7 +233,6 @@ - The font description used for the icons on the desktop. @@ -1082,13 +1081,13 @@ - - Argument used to execute programs in the terminal defined by the 'exec' key. + + The exec argument to use for the default terminal application. - - Terminal program to use when starting applications that require one. + + The default terminal application to use for applications that require a terminal. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index fa5177d5..a9ea83d3 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -255,7 +255,6 @@ - Описание шрифта, использующегося для подписей к значкам на рабочем столе. @@ -1104,13 +1103,13 @@ - - Аргумент, используемый при запуске программ в терминале по ключу «exec». + + Аргумент exec, использующийся приложением терминала по умолчанию. - - Терминал, который используется для запуска нуждающихся в нём приложений. + + Приложение терминала, используемое по умолчанию приложениями, нуждающимися в терминале. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index b5bbd2e0..3b06774a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml @@ -236,7 +236,6 @@ - Mô tả phông chữ dùng cho các biểu tượng trên màn hình nền. @@ -1072,13 +1071,13 @@ - - Đối số được dùng để thực hiện chương trình trong thiết bị cuối được định nghĩa bởi khóa « exec » (thực hiện). + + Đối số thực hiện cần dùng cho ứng dụng thiết bị cuối mặc định - - Chương trình thiết bị cuối cần dùng để khởi chạy ứng dụng có yêu cầu. + + Ứng dụng thiết bị cuối mặc định cần dùng cho các ứng dụng cần thiết thiết bị cuối. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 4d87d131..32a5bc40 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -233,54 +233,54 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -314,11 +314,11 @@ - + - - + + @@ -1909,13 +1909,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + gnomemeeting -c %s @@ -1923,7 +1923,7 @@ The command used to handle "h323" URLs, if enabled. - + True if the command specified in the "command" key should handle "h323" URLs. @@ -1931,13 +1931,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + gnomemeeting -c %s @@ -1945,7 +1945,7 @@ The command used to handle "callto" URLs, if enabled. - + True if the command specified in the "command" key should handle "callto" URLs. @@ -1953,13 +1953,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + gaim-remote uri "%s" @@ -1967,7 +1967,7 @@ The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. @@ -1975,13 +1975,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + evolution %s @@ -1989,7 +1989,7 @@ The command used to handle "mailto" URLs, if enabled. - + True if the command specified in the "command" key should handle "mailto" URLs. @@ -1997,13 +1997,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + epiphany %s @@ -2011,7 +2011,7 @@ The command used to handle "https" URLs, if enabled. - + True if the command specified in the "command" key should handle "https" URLs. @@ -2019,13 +2019,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + epiphany %s @@ -2033,7 +2033,7 @@ The command used to handle "http" URLs, if enabled. - + True if the command specified in the "command" key should handle "http" URLs. @@ -2041,13 +2041,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + gnome-help "%s" @@ -2055,7 +2055,7 @@ The command used to handle "man" URLs, if enabled. - + True if the command specified in the "command" key should handle "man" URLs. @@ -2063,13 +2063,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + gnome-help "%s" @@ -2077,7 +2077,7 @@ The command used to handle "info" URLs, if enabled. - + True if the command specified in the "command" key should handle "info" URLs. @@ -2085,13 +2085,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + gnome-help "%s" @@ -2099,7 +2099,7 @@ The command used to handle "ghelp" URLs, if enabled. - + True if the command specified in the "command" key should handle "ghelp" URLs. @@ -2107,13 +2107,13 @@ - + True if the command used to handle this type of URL should be run in a terminal. - + nautilus "%s" @@ -2121,7 +2121,7 @@ The command used to handle "trash" URLs, if enabled. - + True if the command specified in the "command" key should handle "trash" URLs. @@ -2253,7 +2253,7 @@ - + nautilus %s @@ -2263,21 +2263,20 @@ - - + + -x - Argument used to execute programs in the terminal defined - by the 'exec' key. + The exec argument to use for the default terminal application. - - + + gnome-terminal - Terminal program to use when starting applications that require one. + The default terminal application to use for applications that require a terminal. @@ -2286,7 +2285,7 @@ - + @@ -2298,7 +2297,7 @@ - + @@ -2306,14 +2305,14 @@ URL that provides proxy configuration values. - + The port on the machine defined by "/system/proxy/socks_host" that you proxy through. - + @@ -2321,14 +2320,14 @@ The machine name to proxy socks through. - + The port on the machine defined by "/system/proxy/ftp_host" that you proxy through. - + @@ -2336,14 +2335,14 @@ The machine name to proxy FTP through. - + The port on the machine defined by "/system/proxy/secure_host" that you proxy through. - + @@ -2351,7 +2350,7 @@ The machine name to proxy secure HTTP through. - + none @@ -2362,7 +2361,7 @@ - +
  • @@ -2379,7 +2378,7 @@ netmask (something like 192.168.0.0/24). - + @@ -2387,7 +2386,7 @@ Password to pass as authentication when doing HTTP proxying. - + @@ -2395,7 +2394,7 @@ User name to pass as authentication when doing HTTP proxying. - + If true, then connections to the proxy server require @@ -2404,14 +2403,14 @@ "/system/http_proxy/authentication_password". - + The port on the machine defined by "/system/http_proxy/host" that you proxy through. - + @@ -2419,7 +2418,7 @@ The machine name to proxy HTTP through. - + Enables the proxy settings when accessing HTTP over the @@ -2428,7 +2427,7 @@
    • - + @@ -2437,7 +2436,7 @@ visible in the "network:///" location. - + merged @@ -2450,30 +2449,30 @@ - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - + + -- 2.39.5