From b6402224ca1075edd6473a4738f459d896ca9d6c Mon Sep 17 00:00:00 2001 From: frank Date: Tue, 27 Mar 2012 18:31:58 +0200 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 | 508 ++++++++---------- 5 files changed, 251 insertions(+), 293 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 9a047bad..3cfad72a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -379,7 +379,6 @@ - Zeichenkodierung für Untertitel @@ -8102,13 +8101,13 @@ z.B. »Sans Italic 10«. - - Das an die Vorgabe-Terminal-Anwendung zu übergebende exec-Argument. + + Das zum Ausführen von Programmen im Terminal verwendete, vom Schlüssel »exec« festgelegte Argument. - - Die Vorgabe-Terminal-Anwendung, die für Anwendungen verwendet wird, die ein Terminal erforderlich machen. + + Zu verwendende Terminal-Anwendung beim Starten von Anwendungen, die ein Terminal benötigen. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index cef9a034..a7ce9905 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -379,7 +379,6 @@ - Encoding charset for subtitle @@ -8059,13 +8058,13 @@ - - The exec argument to use for the default terminal application. + + Argument used to execute programs in the terminal defined by the 'exec' key. - - The default terminal application to use for applications that require a terminal. + + Terminal program to use when starting applications that require one. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 353f6776..6f2c8faa 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -379,7 +379,6 @@ - Кодировка символов для субтитров @@ -8044,13 +8043,13 @@ - - Аргумент exec, использующийся приложением терминала по умолчанию. + + Аргумент, используемый при запуске программ в терминале по ключу «exec». - - Приложение терминала, используемое по умолчанию приложениями, нуждающимися в терминале. + + Терминал, который используется для запуска нуждающихся в нём приложений. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index 1ba8af0b..3bc5cceb 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml @@ -373,7 +373,6 @@ - Bảng mã ký tự cho phụ đề @@ -7307,13 +7306,13 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để - - Đối số thực hiện cần dùng cho ứng dụng thiết bị cuối mặc định + + Đố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). - - Ứ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. + + 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. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 7e16f01b..5e652769 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2183,28 +2183,28 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -2238,99 +2238,99 @@ - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - + + + + + + + - + @@ -2805,7 +2805,7 @@ - + @@ -2959,43 +2959,43 @@ - - + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + @@ -16908,7 +16908,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16916,7 +16916,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Cursor theme name. Used only by Xservers that support Xcursor, @@ -16924,7 +16924,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Font name of the cursor. If unset, the default font is @@ -16934,26 +16934,26 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Highlights the current location of the pointer when the Control key is pressed and released. - + Length of a double click. - + Distance before a drag is started. - + Distance in pixels the pointer must move before @@ -16961,20 +16961,20 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati system default. - + Acceleration multiplier for mouse motion. A value of -1 is the system default. - + Single click to open icons. - + Swap left and right mouse buttons for left-handed mice. @@ -16982,28 +16982,28 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + When set to true, GNOME will remember the state of the NumLock LED between sessions. - + File name of the bell sound to be played. - + - + - + on @@ -17011,27 +17011,27 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati possible values are "on", "off", and "custom". - + - + - + - + - + @@ -17194,7 +17194,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17202,7 +17202,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17210,7 +17210,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17218,7 +17218,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17228,7 +17228,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + crux_teal @@ -17239,7 +17239,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17248,121 +17248,109 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + Beep when a modifier is pressed. - + Disable if two keys are pressed at the same time. - - + + - - Whether the sticky keys keyboard accessibility feature is turned on. - - + - + - + - + Do not accept a key as being pressed unless held for @delay milliseconds. - - + + - - Whether the slow keys keyboard accessibility feature is turned on. - - + How many milliseconds to wait before mouse movement keys start to operate. - + How many milliseconds it takes to go from 0 to maximum speed. - + How many pixels per second to move at the maximum speed. - - + + - - Whether the mouse keys keyboard accessibility feature is turned on. - - + - + Ignore multiple presses of the _same_ key within @delay milliseconds. - - + + - - Whether the bounce keys keyboard accessibility feature is turned on. - - + - + - + - + @@ -17370,21 +17358,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the context menus of entries and text views should offer to insert control characters. - + Whether the context menus of entries and text views should offer to change the input method. - + F10 @@ -17392,7 +17380,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Keyboard shortcut to open the menu bars. - + gio @@ -17402,19 +17390,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "gtk+". - + Whether to display a status bar meter on the right. - + Whether to use a custom font in gtk+ applications. - + Monospace 10 @@ -17423,7 +17411,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati in locations like terminals. - + Sans 10 @@ -17431,7 +17419,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the default font used for reading documents. - + @@ -17439,7 +17427,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the input method module used by GTK+. - + callback @@ -17447,7 +17435,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the GTK+ input method Status Style used by gtk+. - + callback @@ -17455,7 +17443,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the GTK+ input method Preedit Style used by gtk+. - + Sans 10 @@ -17463,7 +17451,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the default font used by gtk+. - + Default @@ -17471,7 +17459,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Basename of the default theme used by gtk+. - + Clearlooks @@ -17479,7 +17467,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Basename of the default theme used by gtk+. - + gnome @@ -17487,19 +17475,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Icon theme to use for the panel, nautilus etc. - + Length of the cursor blink cycle, in milliseconds. - + Whether the cursor should blink. - + large-toolbar @@ -17508,31 +17496,31 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "large-toolbar". - + Whether the user can detach toolbars and move them around. - + Whether the user can detach menubars and move them around. - + Whether buttons may display an icon in addition to the button text. - + Whether menus may display an icon next to a menu entry. - + both-horiz @@ -17541,20 +17529,20 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "text". - + Whether the user can dynamically type a new accelerator when positioned over an active menuitem. - + Whether menus should have a tearoff. - + Whether animations should be displayed. Note: This is a global @@ -17562,7 +17550,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether Applications should have accessibility support. @@ -17570,13 +17558,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether to play sounds on input events. - + freedesktop @@ -17584,26 +17572,26 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The XDG sound theme to use for event sounds. - + Whether to play sounds on user events. - + Enable sound server startup. - + The default mixer tracks used by the multimedia key bindings. - + @@ -17613,7 +17601,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17621,7 +17609,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17629,7 +17617,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17638,7 +17626,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17648,7 +17636,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17657,7 +17645,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17667,7 +17655,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17679,13 +17667,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning. - + Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning. @@ -17693,7 +17681,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + solid @@ -17701,7 +17689,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid". - + #66ba00 @@ -17709,7 +17697,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Right or Bottom color when drawing gradients, not used for solid color. - + #66ba00 @@ -17717,13 +17705,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Left or Top color when drawing gradients, or the solid color. - + Opacity with which to draw the background picture. - + /usr/share/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png @@ -17731,7 +17719,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati File to use for the background image. - + zoom @@ -17741,7 +17729,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "stretched", "zoom", "spanned". - + Have GNOME draw the desktop background. @@ -17749,7 +17737,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled. @@ -19636,13 +19624,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19650,7 +19636,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19658,13 +19643,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19672,7 +19655,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19680,13 +19662,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19694,7 +19674,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19702,13 +19681,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19716,7 +19693,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19724,13 +19700,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19738,7 +19712,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19746,13 +19719,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19760,7 +19731,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19768,13 +19738,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19782,7 +19750,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19790,13 +19757,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19804,7 +19769,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -19812,13 +19776,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - @@ -19826,7 +19788,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati totem "%s" - @@ -20116,13 +20077,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the default tasks application needs a terminal to run - + evolution @@ -20132,13 +20093,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the default calendar application needs a terminal to run - + evolution @@ -20148,19 +20109,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the default browser understands netscape remote. - + Whether the default browser needs a terminal to run. - + mozilla @@ -20170,7 +20131,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + A list with names of the first window manager workspaces. @@ -20178,7 +20139,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The number of workspaces the window manager should use @@ -20186,7 +20147,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Window manager to try first. @@ -20194,7 +20155,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Fallback window manager if user window manager can't be found. @@ -20229,13 +20190,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + GNOME to start preferred Visual assistive technology application during login. - + orca @@ -20245,13 +20206,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + GNOME to start preferred Mobility assistive technology application during login. - + dasher @@ -20272,20 +20233,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - + + -x - The exec argument to use for the default terminal application. + Argument used to execute programs in the terminal defined + by the 'exec' key. - - + + gnome-terminal - The default terminal application to use for applications that require a terminal. + Terminal program to use when starting applications that require one. -- 2.39.5