From 3bd6aac8450347d7d4a90c5ccebd2ecd0b4095ab Mon Sep 17 00:00:00 2001 From: fbrehm Date: Sun, 19 Feb 2012 21:36:27 +0100 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 | 976 +++++++++--------- 4 files changed, 491 insertions(+), 488 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 058d011..6d8b2e0 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -1844,6 +1844,7 @@ + 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 54cfb71..74189e3 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -1844,6 +1844,7 @@ + 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 cb0bda8..becbf9c 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -1844,6 +1844,7 @@ + Кодировка символов для субтитров diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 0915959..21e610e 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -496,31 +496,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2184,388 +2184,388 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -2788,49 +2788,49 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2938,7 +2938,7 @@ - + Whether to disable the keyboard shortcuts @@ -5982,12 +5982,12 @@ - + - + @@ -5995,7 +5995,7 @@ - + @@ -6003,13 +6003,13 @@ - + Whether to disable the plugins in the user's home directory - + @@ -6017,7 +6017,7 @@ Default location for the "Take Screenshot" dialogs, default is the Pictures directory - + @@ -6025,7 +6025,7 @@ Default location for the "Open..." dialogs, default is the current directory - + UTF-8 @@ -6051,7 +6051,7 @@ - + Sans Bold 20 @@ -6059,13 +6059,13 @@ Pango font description for subtitle rendering - + Amount of data to buffer for network streams before starting to display the stream (in seconds) - + Quality settings for the audio visualization: @@ -6075,7 +6075,7 @@ "3" for extra large. - + @@ -6088,27 +6088,27 @@ - + - + - + - + - + Approximate network connection speed, used to select quality on media over the network: @@ -6126,39 +6126,39 @@ "11" for Intranet/LAN. - + - + - + - + - + - + goom - + @@ -6166,7 +6166,7 @@ - + @@ -16757,1344 +16757,1344 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + - + /usr/bin/totem-video-thumbnailer -s %s %u %o - + @@ -19131,17 +19131,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19150,17 +19150,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19169,17 +19169,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19188,17 +19188,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19207,17 +19207,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19226,17 +19226,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19245,17 +19245,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19264,17 +19264,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" @@ -19283,17 +19283,17 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + - + totem "%s" -- 2.39.5