From: fbrehm Date: Mon, 23 Apr 2012 11:55:08 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=357e2bf89477b0b66c8132ae46cf77608f3e896a;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 0ecf3b5..79ffaf2 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -6179,6 +6179,7 @@ z.B. »Sans Italic 10«. + Die von Symbolen auf der Arbeitsfläche zu verwendende Schriftbeschreibung. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 40b1888..bad8cf6 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -6178,6 +6178,7 @@ + The font description used for the icons on the desktop. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index ede17a2..0dbf273 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -6146,6 +6146,7 @@ + Описание шрифта, использующегося для подписей к значкам на рабочем столе. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 521a22e..7d944cb 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -1872,91 +1872,91 @@ - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2146,9 +2146,9 @@ - - - + + + @@ -14742,7 +14742,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14754,7 +14754,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + This name can be set if you want a custom name @@ -14762,7 +14762,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + This name can be set if you want a custom name @@ -14770,7 +14770,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + This name can be set if you want a custom name @@ -14778,7 +14778,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + This name can be set if you want a custom name @@ -14786,7 +14786,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14795,7 +14795,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14804,7 +14804,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14813,7 +14813,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14822,7 +14822,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14834,7 +14834,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14847,7 +14847,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14868,7 +14868,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14889,7 +14889,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + smaller @@ -14899,7 +14899,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14909,7 +14909,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + name @@ -14922,7 +14922,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
  • - + @@ -14931,7 +14931,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + standard @@ -14943,7 +14943,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14975,7 +14975,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14983,7 +14983,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + standard @@ -14993,7 +14993,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15001,7 +15001,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15010,7 +15010,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15018,7 +15018,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15030,7 +15030,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + name @@ -15041,7 +15041,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -15065,7 +15065,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
  • - + @@ -15075,7 +15075,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15084,7 +15084,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15093,7 +15093,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15102,7 +15102,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15110,7 +15110,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15118,7 +15118,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + locale @@ -15129,7 +15129,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + icon_view @@ -15141,7 +15141,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15149,7 +15149,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Filename for the default side pane background. Only used if side_pane_background_set is true. - + #ffffff @@ -15157,13 +15157,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Filename for the default side pane background. Only used if side_pane_background_set is true. - + Whether a custom default side pane background has been set. - + @@ -15171,7 +15171,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Filename for the default folder background. Only used if background_set is true. - + #ffffff @@ -15179,13 +15179,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Color for the default folder background. Only used if background_set is true. - + Whether a custom default folder background has been set. - + search_by_text @@ -15199,7 +15199,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15209,7 +15209,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Sans 10 @@ -15234,7 +15234,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15243,7 +15243,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15252,7 +15252,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15262,7 +15262,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15277,7 +15277,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15289,7 +15289,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15300,7 +15300,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15315,7 +15315,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + default @@ -15327,7 +15327,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15337,7 +15337,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15347,7 +15347,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15356,7 +15356,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15365,7 +15365,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + ask @@ -15379,7 +15379,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + double @@ -15390,7 +15390,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15404,7 +15404,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15419,7 +15419,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15429,7 +15429,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15438,7 +15438,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15446,7 +15446,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15457,7 +15457,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15468,7 +15468,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15480,7 +15480,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -15495,7 +15495,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15504,7 +15504,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15515,7 +15515,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15525,7 +15525,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15534,7 +15534,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15543,7 +15543,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16615,7 +16615,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
  • - + after_current_tab @@ -16626,7 +16626,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16636,7 +16636,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +