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 c20e1f230720437cf601a07de9cf60a22a2bd799..dec37fc57cd2c7b06ba7d150b9a164fd9db4befb 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -5799,26 +5799,32 @@ z.B. »Sans Italic 10«.</longdesc>
                                        </entry>
                                        <entry name="coordinates">
                                                <local_schema short_desc="Standortkoordinaten">
+                                                       <longdesc>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].</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location4">
                                                <local_schema short_desc="Wetter für eine Stadt">
+                                                       <longdesc>Die Stadt, für die gweather die Informationen darstellt.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location3">
                                                <local_schema short_desc="Radarstandort">
+                                                       <longdesc>Ein dreistelliger Code zum Abfragen der Radarkarten von weather.com, siehe http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location2">
                                                <local_schema short_desc="Zonen-Standort">
+                                                       <longdesc>Eine eindeutige Zone für die Stadt, siehe http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location1">
                                                <local_schema short_desc="Nächstgelegene Stadt">
+                                                       <longdesc>Nächstgelegene Zone, z.B. einer Hauptstadt, siehe http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location0">
                                                <local_schema short_desc="Informationen zum Wetterstandort.">
+                                                       <longdesc>Informationen zum Wetterstandort.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="enable_radar_map">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 078b3fd2578a3969681b52893e4b16c43a6159c9..bd65f0bf72ec382f3461f1f80692a30b06409d0d 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -5798,26 +5798,32 @@
                                        </entry>
                                        <entry name="coordinates">
                                                <local_schema short_desc="Location co-ordinates">
+                                                       <longdesc>Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW].</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location4">
                                                <local_schema short_desc="Weather for a city">
+                                                       <longdesc>The city that gweather displays information for.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location3">
                                                <local_schema short_desc="Radar location">
+                                                       <longdesc>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</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location2">
                                                <local_schema short_desc="Zone location">
+                                                       <longdesc>A unique zone for the city, as found from http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location1">
                                                <local_schema short_desc="Nearby city">
+                                                       <longdesc>Nearby major zone, such as a capital city, as found from http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location0">
                                                <local_schema short_desc="Weather location information">
+                                                       <longdesc>Weather location information.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="enable_radar_map">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 35fa85358bab49aebfea301a7532e573b1ce1f9a..492ca2694b7b379d9b2b1c192dee83029bb32297 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -5798,26 +5798,32 @@
                                        </entry>
                                        <entry name="coordinates">
                                                <local_schema short_desc="Координаты местоположения">
+                                                       <longdesc>Ваши широта и долгота в формате DD-MM-SS[NS] DD-MM-SS[EW].</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location4">
                                                <local_schema short_desc="Погода для города">
+                                                       <longdesc>Город, погоду в котором показывает gweather.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location3">
                                                <local_schema short_desc="Радарный адрес">
+                                                       <longdesc>Трёхзначный код для получения радарных карт от weather.com — его можно найти по адресу http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location2">
                                                <local_schema short_desc="Местоположение зоны">
+                                                       <longdesc>Уникальная зона для города — её можно найти в http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location1">
                                                <local_schema short_desc="Ближайший город">
+                                                       <longdesc>Ближайший крупный город — его можно найти в http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="location0">
                                                <local_schema short_desc="Сведения о погоде в местоположении">
+                                                       <longdesc>Сведения о погоде в местоположении.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="enable_radar_map">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index f55ce30406bc5b4e93ffd21e1e00f0658e7907f0..5d280cb6ede22614474667e3bd76da14770cef60 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -14247,36 +14247,30 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                <entry name="fullscreen" mtime="1329675167" type="schema" stype="bool" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
                                                <default type="bool" value="false"/>
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="maximized" mtime="1329675167" type="schema" stype="bool" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
                                                <default type="bool" value="false"/>
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="width" mtime="1329675167" type="schema" stype="int" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
                                                <default type="int" value="0"/>
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="snap_cols_pow2" mtime="1329675167" type="schema" stype="bool" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
                                                <default type="bool" value="false"/>
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="height" mtime="1329675167" type="schema" stype="int" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
                                                <default type="int" value="0"/>
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="font" mtime="1329675167" type="schema" stype="string" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="last_char" mtime="1329675167" type="schema" stype="string" owner="gucharmap">
@@ -14284,29 +14278,27 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <default type="string">
                                                        <stringvalue>0</stringvalue>
                                                </default>
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                                <entry name="chapters_mode" mtime="1329675167" type="schema" stype="string" owner="gucharmap">
                                        <local_schema locale="C" short_desc="">
-                                               <longdesc></longdesc>
                                        </local_schema>
                                </entry>
                        </dir>
                        <dir name="gweather">
                                <dir name="prefs">
-                                       <entry name="radar" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="radar" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Url for the radar map">
                                                        <longdesc>The custom url from where to retrieve a radar map.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_custom_radar_url" mtime="1329420928" type="schema" stype="bool" owner="gweather-applet-2">
+                                       <entry name="use_custom_radar_url" mtime="1329676387" type="schema" stype="bool" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Use custom url for the radar map">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>If true, then retrieve a radar map from a location specified by the &quot;radar&quot; key.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="coordinates" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="coordinates" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="en_GB">
                                                        <default type="string">
                                                                <stringvalue>DEFAULT_COORDINATES</stringvalue>
@@ -14329,7 +14321,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        </default>
                                                </local_schema>
                                        </entry>
-                                       <entry name="location4" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="location4" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="en_GB">
                                                        <default type="string">
                                                                <stringvalue>London/Heathrow</stringvalue>
@@ -14352,7 +14344,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        </default>
                                                </local_schema>
                                        </entry>
-                                       <entry name="location3" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="location3" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="en_GB">
                                                        <default type="string">
                                                                <stringvalue>---</stringvalue>
@@ -14371,11 +14363,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                                <local_schema locale="ru">
                                                        <default type="string">
-                                                               <stringvalue></stringvalue>
+                                                               <stringvalue> </stringvalue>
                                                        </default>
                                                </local_schema>
                                        </entry>
-                                       <entry name="location2" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="location2" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="en_GB">
                                                        <default type="string">
                                                                <stringvalue>:RBPMS</stringvalue>
@@ -14394,11 +14386,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                                <local_schema locale="ru">
                                                        <default type="string">
-                                                               <stringvalue></stringvalue>
+                                                               <stringvalue> </stringvalue>
                                                        </default>
                                                </local_schema>
                                        </entry>
-                                       <entry name="location1" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="location1" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="en_GB">
                                                        <default type="string">
                                                                <stringvalue>EGLL</stringvalue>
@@ -14421,7 +14413,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        </default>
                                                </local_schema>
                                        </entry>
-                                       <entry name="location0" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="location0" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="en_GB">
                                                        <default type="string">
                                                                <stringvalue>London/Heathrow</stringvalue>
@@ -14444,18 +14436,18 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        </default>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_radar_map" mtime="1329420928" type="schema" stype="bool" owner="gweather-applet-2">
+                                       <entry name="enable_radar_map" mtime="1329676387" type="schema" stype="bool" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Display radar map">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Fetch a radar map on each update.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_detailed_forecast" mtime="1329420928" type="schema" stype="bool" owner="gweather-applet-2">
+                                       <entry name="enable_detailed_forecast" mtime="1329676387" type="schema" stype="bool" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Not used anymore">
                                                        <default type="bool" value="false"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="temperature_unit" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="temperature_unit" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Temperature unit">
                                                        <default type="string">
                                                                <stringvalue>Default</stringvalue>
@@ -14463,7 +14455,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>The unit to use for temperature.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="speed_unit" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="speed_unit" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Speed unit">
                                                        <default type="string">
                                                                <stringvalue>Default</stringvalue>
@@ -14471,7 +14463,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>The unit to use for wind speed.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="pressure_unit" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="pressure_unit" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Pressure unit">
                                                        <default type="string">
                                                                <stringvalue>Default</stringvalue>
@@ -14479,7 +14471,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>The unit to use for pressure.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="distance_unit" mtime="1329420928" type="schema" stype="string" owner="gweather-applet-2">
+                                       <entry name="distance_unit" mtime="1329676387" type="schema" stype="string" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Distance unit">
                                                        <default type="string">
                                                                <stringvalue>Default</stringvalue>
@@ -14487,19 +14479,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>The unit to use for visibility.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_metric" mtime="1329420928" type="schema" stype="bool" owner="gweather-applet-2">
+                                       <entry name="enable_metric" mtime="1329676387" type="schema" stype="bool" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Use metric units">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use metric units instead of english units.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="auto_update_interval" mtime="1329420928" type="schema" stype="int" owner="gweather-applet-2">
+                                       <entry name="auto_update_interval" mtime="1329676387" type="schema" stype="int" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Update interval">
                                                        <default type="int" value="1800"/>
                                                        <longdesc>The interval, in seconds, between automatic updates.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="auto_update" mtime="1329420928" type="schema" stype="bool" owner="gweather-applet-2">
+                                       <entry name="auto_update" mtime="1329676387" type="schema" stype="bool" owner="gweather-applet-2">
                                                <local_schema locale="C" short_desc="Update the data automatically">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Determines whether the applet automatically updates its weather statistics or not.</longdesc>