From: fbrehm Date: Sun, 19 Feb 2012 18:36:58 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=31e88bd34dc1f69798288dd28395c38177b19518;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 dec37fc..dceb01e 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -5799,32 +5799,26 @@ z.B. »Sans Italic 10«. - Breiten- und Längengrad Ihres aktuellen Standorts, angegeben in GG-MM-SS[NS] GG-MM-SS[OW], also Grad-Minuten-Sekunden[Nord-Süd] bzw. [Ost-West]. - Die Stadt, für die gweather die Informationen darstellt. - Ein dreistelliger Code zum Abfragen der Radarkarten von weather.com, siehe http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Eine eindeutige Zone für die Stadt, siehe http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Nächstgelegene Zone, z.B. einer Hauptstadt, siehe http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Informationen zum Wetterstandort. @@ -6104,6 +6098,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 bd65f0b..9211f04 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -5798,32 +5798,26 @@ - Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]. - The city that gweather displays information for. - A three-digit-long code for retrieving radar maps from weather.com, found from http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - A unique zone for the city, as found from http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Nearby major zone, such as a capital city, as found from http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Weather location information. @@ -6103,6 +6097,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 492ca26..e680e52 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -5798,32 +5798,26 @@ - Ваши широта и долгота в формате DD-MM-SS[NS] DD-MM-SS[EW]. - Город, погоду в котором показывает gweather. - Трёхзначный код для получения радарных карт от weather.com — его можно найти по адресу http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Уникальная зона для города — её можно найти в http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Ближайший крупный город — его можно найти в http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in - Сведения о погоде в местоположении. @@ -6103,6 +6097,7 @@ + Описание шрифта, использующегося для подписей к значкам на рабочем столе. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 5d280cb..d5f3e72 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -1839,91 +1839,91 @@ - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2113,9 +2113,9 @@ - - - + + + @@ -14363,7 +14363,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14386,7 +14386,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14501,7 +14501,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14513,7 +14513,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 @@ -14521,7 +14521,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 @@ -14529,7 +14529,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 @@ -14537,7 +14537,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 @@ -14545,7 +14545,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14554,7 +14554,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14563,7 +14563,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14572,7 +14572,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14581,7 +14581,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14593,7 +14593,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14606,7 +14606,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14627,7 +14627,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14648,7 +14648,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + smaller @@ -14658,7 +14658,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14668,7 +14668,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + name @@ -14681,7 +14681,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
  • - + @@ -14690,7 +14690,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + standard @@ -14702,7 +14702,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14734,7 +14734,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14742,7 +14742,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + standard @@ -14752,7 +14752,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14760,7 +14760,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14769,7 +14769,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14777,7 +14777,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14789,7 +14789,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + name @@ -14800,7 +14800,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -14824,7 +14824,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 - + @@ -14843,7 +14843,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14852,7 +14852,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14861,7 +14861,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14869,7 +14869,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14877,7 +14877,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + locale @@ -14888,7 +14888,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + icon_view @@ -14900,7 +14900,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14908,7 +14908,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 @@ -14916,13 +14916,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. - + @@ -14930,7 +14930,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 @@ -14938,13 +14938,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 @@ -14958,7 +14958,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -14968,7 +14968,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Sans 10 @@ -14993,7 +14993,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15002,7 +15002,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15011,7 +15011,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15021,7 +15021,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15036,7 +15036,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15048,7 +15048,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15059,7 +15059,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15074,7 +15074,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + default @@ -15086,7 +15086,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15096,7 +15096,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15106,7 +15106,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15115,7 +15115,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15124,7 +15124,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + ask @@ -15138,7 +15138,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + double @@ -15149,7 +15149,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15163,7 +15163,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + local_only @@ -15178,7 +15178,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15188,7 +15188,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15197,7 +15197,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15205,7 +15205,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15216,7 +15216,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15227,7 +15227,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15239,7 +15239,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -15254,7 +15254,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15263,7 +15263,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15274,7 +15274,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15284,7 +15284,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15293,7 +15293,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -15302,7 +15302,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16374,7 +16374,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
  • - + after_current_tab @@ -16385,7 +16385,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16395,7 +16395,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +