From 02eb50c683d0cdb921b126bc509599e4cf18e2a5 Mon Sep 17 00:00:00 2001 From: fbrehm Date: Wed, 28 Mar 2012 11:15:49 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- gconf/gconf.xml.defaults/%gconf-tree-de.xml | 1 - .../gconf.xml.defaults/%gconf-tree-en_GB.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree.xml | 452 +++++++++--------- 4 files changed, 226 insertions(+), 229 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 6ae8b30..0ecf3b5 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -1876,7 +1876,6 @@ - Zeichenkodierung für Untertitel diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index df0bb83..40b1888 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -1876,7 +1876,6 @@ - Encoding charset for subtitle diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index f127698..ede17a2 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -1844,7 +1844,6 @@ - Кодировка символов для субтитров diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 77a7e2a..a1811bc 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2149,73 +2149,73 @@ - + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - + + + + + + + - + @@ -2701,28 +2701,28 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -2756,33 +2756,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2933,43 +2933,43 @@ - - + + - - + + - - - - + + + + - - + + - - + + - - - + + + - - + + @@ -16576,7 +16576,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + crux_teal @@ -16586,7 +16586,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16594,7 +16594,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16602,7 +16602,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16611,7 +16611,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16621,7 +16621,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16630,7 +16630,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16640,7 +16640,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16652,7 +16652,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16660,7 +16660,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16668,7 +16668,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16676,7 +16676,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16686,13 +16686,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether to play sounds on input events. - + freedesktop @@ -16700,26 +16700,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. - + @@ -16730,116 +16730,116 @@ 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. - + - + - + - + - + Do not accept a key as being pressed unless held for @delay milliseconds. - + - + 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. - + - + - + Ignore multiple presses of the _same_ key within @delay milliseconds. - + - + - + - + - + - + @@ -16849,13 +16849,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. @@ -16863,7 +16863,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + solid @@ -16871,7 +16871,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 @@ -16879,7 +16879,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 @@ -16887,13 +16887,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 @@ -16901,7 +16901,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati File to use for the background image. - + zoom @@ -16911,7 +16911,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "stretched", "zoom", "spanned". - + Have GNOME draw the desktop background. @@ -16919,7 +16919,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. @@ -18659,7 +18659,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18667,7 +18667,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, @@ -18675,7 +18675,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 @@ -18685,26 +18685,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 @@ -18712,20 +18712,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. @@ -18733,28 +18733,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 @@ -18762,27 +18762,27 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati possible values are "on", "off", and "custom". - + - + - + - + - + @@ -18945,21 +18945,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 @@ -18967,7 +18967,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Keyboard shortcut to open the menu bars. - + gio @@ -18977,19 +18977,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 @@ -18998,7 +18998,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati in locations like terminals. - + Sans 10 @@ -19006,7 +19006,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the default font used for reading documents. - + @@ -19014,7 +19014,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 @@ -19022,7 +19022,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 @@ -19030,7 +19030,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 @@ -19038,7 +19038,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the default font used by gtk+. - + Default @@ -19046,7 +19046,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Basename of the default theme used by gtk+. - + Clearlooks @@ -19054,7 +19054,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Basename of the default theme used by gtk+. - + gnome @@ -19062,19 +19062,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 @@ -19083,31 +19083,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 @@ -19116,20 +19116,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 @@ -19137,7 +19137,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether Applications should have accessibility support. @@ -19756,13 +19756,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 @@ -19772,13 +19772,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 @@ -19788,7 +19788,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. @@ -19796,7 +19796,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The number of workspaces the window manager should use @@ -19804,7 +19804,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Window manager to try first. @@ -19812,7 +19812,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. @@ -19847,13 +19847,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 @@ -19863,13 +19863,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 @@ -19880,19 +19880,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 @@ -19912,7 +19912,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + -x @@ -19921,7 +19921,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati by the 'exec' key. - + gnome-terminal -- 2.39.5