Sync translations with transifex

103 files changed, 24707 insertions, 26255 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index aa77117..a4a1aa1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -20,6 +20,7 @@ da
 de
 dz
 el
+en_AU
 en_CA
 en_GB
 en@shaw
diff --git a/po/af.po b/po/af.po
index 32de1e1..2ca5385 100644
--- a/po/af.po
+++ b/po/af.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-03-11 21:07+0000\n"
-"Last-Translator: nato323 <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/MATE/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Pretoria"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "FALA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "-25.706944 28.229444"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Verstek"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "°C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "°F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ongeldige"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "myl/h"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knope"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort-skaal"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwichtyd"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "'n Driesyferlange kode vir herwinning van radarkaarte vanaf weather.com, gevind by http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "'n Unieke sone vir die stad, soos gevind by http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Werk die data outomaties by"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Bepaal of die miniprogram outomaties die weerstatistiek opdateer of nie."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Wys radarkaart"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Afstandseenheid"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Bywerkingsinterval"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Verkry 'n radarkaart met elke opdatering."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Die interval, in sekondes, tussen die outomatiese opdaterings."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Indien waar, verkry dan 'n radarkaart van 'n plek gespesifiseer deur die \"radar\"-sleutel."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Gebruik metrieke eenhede"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Lengte- en breedtegraad van u ligging uitgedruk in DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Gebruik metrieke eenhede in plaas van Engelse eenhede."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Ligging se koördinate"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Nabygeleë stad"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Afstandseenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Nabygeleë groot sone, soos 'n hoofstad, soos gevind in http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "In onbruik"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Druk-eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarplek"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Spoed-eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatuur-eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Die stad waarvoor mateweather inligting vertoon."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Die persoonlike URL vanwaar 'n radarkaart verkry kan word."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "In onbruik"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Die interval, in sekondes, tussen die outomatiese opdaterings."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Wys radarkaart"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Die eenheid om vir druk te gebruik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Verkry 'n radarkaart met elke opdatering."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Die eenheid om vir temperatuur te gebruik."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Die eenheid om vir sigbaarheid te gebruik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Weerliggingsinligting"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Die eenheid om vir windspoed te gebruik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weerliggingsinligting."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Bywerkingsinterval"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Werk die data outomaties by"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Nabygeleë stad"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL vir die radarkaart"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Gebruik persoonlike URL vir die radarkaart"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Gebruik metrieke eenhede"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Soneligging"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Gebruik metrieke eenhede in plaas van Engelse eenhede."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarplek"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Weer vir 'n stad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Weerliggingsinligting"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Die stad waarvoor mateweather inligting vertoon."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Weerliggingsinligting."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Soneligging"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Ligging se koördinate"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Lengte- en breedtegraad van u ligging uitgedruk in DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Gebruik persoonlike URL vir die radarkaart"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Indien waar, verkry dan 'n radarkaart van 'n plek gespesifiseer deur die \"radar\"-sleutel."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL vir die radarkaart"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Die persoonlike URL vanwaar 'n radarkaart verkry kan word."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "Noordwes"
 msgid "North - Northwest"
 msgstr "Noordnoordwes"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ongeldige"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Oop lug"
diff --git a/po/am.po b/po/am.po
index 218f9e0..1883ec2 100644
--- a/po/am.po
+++ b/po/am.po
@@ -4,382 +4,372 @@
 # 
 # Translators:
 # Ge'ez Frontier Foundation <[email protected]>, 2002.
+# samson <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-19 20:48+0000\n"
+"Last-Translator: samson <[email protected]>\n"
+"Language-Team: Amharic (http://www.transifex.com/projects/p/MATE/language/am/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: am\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr ""
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr ""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
-msgstr ""
+msgstr "ነባር "
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
-msgstr ""
+msgstr "ሴ "
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
-msgstr ""
+msgstr "ፋ "
+
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ዋጋ የሌለው "
 
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
-msgstr ""
+msgstr "ሚ/ሰ "
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
-msgstr ""
+msgstr "ኪሜ/ሰ "
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
-msgstr ""
+msgstr "ሚበሰ "
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr ""
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr ""
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr ""
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr ""
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
-msgstr ""
+msgstr "ሚ "
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
-msgstr ""
+msgstr "ኪሜ "
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
-msgstr ""
-
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr ""
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr ""
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr ""
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr ""
+msgstr "ማይል "
 
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "ዳታውን ራሱ በራሱ ማሻሻያ "
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "የማሻሻያ ክፍተት "
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr ""
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'miles'"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "የርቀት መለኪያ "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "የአየር ግፊት መለኪያ "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "ፍጥነት መለኪያ "
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
-msgstr ""
+msgstr "የአየር ሙቀት መለኪያ "
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "የራዳር ካርታ ማሳያ "
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "በሚያሻሽል ጊዜ የራዳር ካርታ ፈልጎ ማግኛ "
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "የአየር ንብረት አካባቢ መረጃ "
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "የአየር ንብረት አካባቢ መረጃ "
+
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "በቅርብ ያለ ከተማ "
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "የክልሉ አካባቢ "
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "የራዳር አካባቢ "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
+msgstr "የአየር ንብረት ለ ከተማ "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "የሜት አየር ንብረት መረጃ የሚታይበት ከተማ"
+
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "የአካባቢ መጋጠሚያዎች "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url ለራዳር ካርታ "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
 msgstr ""
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
-msgstr ""
+msgstr "ያልታወቀ "
 
 #. Translators: %d is an error code, and %s the error string
 #: ../libmateweather/weather-metar.c:504
@@ -393,7 +383,7 @@ msgstr ""
 
 #: ../libmateweather/weather.c:232
 msgid "Variable"
-msgstr ""
+msgstr "ተለዋዋጭ "
 
 #: ../libmateweather/weather.c:233
 msgid "North"
@@ -401,15 +391,15 @@ msgstr "ሰሜን"
 
 #: ../libmateweather/weather.c:233
 msgid "North - NorthEast"
-msgstr ""
+msgstr "ከሰሜን - ወደ ሰሜን ምስራቅ "
 
 #: ../libmateweather/weather.c:233
 msgid "Northeast"
-msgstr ""
+msgstr "ሰሜን ምስራቅ "
 
 #: ../libmateweather/weather.c:233
 msgid "East - NorthEast"
-msgstr ""
+msgstr "ከምስራቅ - ወደ ሰሜን ምስራቅ  "
 
 #: ../libmateweather/weather.c:234
 msgid "East"
@@ -417,15 +407,15 @@ msgstr "ምሥራቅ"
 
 #: ../libmateweather/weather.c:234
 msgid "East - Southeast"
-msgstr ""
+msgstr "ከምስራቅ - ወደ ደቡብ ምስራቅ  "
 
 #: ../libmateweather/weather.c:234
 msgid "Southeast"
-msgstr ""
+msgstr "ደቡብ ምስራቅ  "
 
 #: ../libmateweather/weather.c:234
 msgid "South - Southeast"
-msgstr ""
+msgstr "ደቡብ  - ከደቡብ ምስራቅ "
 
 #: ../libmateweather/weather.c:235
 msgid "South"
@@ -433,15 +423,15 @@ msgstr "ደቡብ"
 
 #: ../libmateweather/weather.c:235
 msgid "South - Southwest"
-msgstr ""
+msgstr "ደቡብ - ወደ ደቡብ ምዕራብ "
 
 #: ../libmateweather/weather.c:235
 msgid "Southwest"
-msgstr ""
+msgstr "ደቡብ ምዕራብ "
 
 #: ../libmateweather/weather.c:235
 msgid "West - Southwest"
-msgstr ""
+msgstr "ምዕራብ - ወደ ደቡብ ምዕራብ "
 
 #: ../libmateweather/weather.c:236
 msgid "West"
@@ -449,36 +439,31 @@ msgstr "ምዕራብ"
 
 #: ../libmateweather/weather.c:236
 msgid "West - Northwest"
-msgstr ""
+msgstr "ምዕራብ - ሰሜን ምዕራብ "
 
 #: ../libmateweather/weather.c:236
 msgid "Northwest"
-msgstr ""
+msgstr "ሰሜን ምዕራብ"
 
 #: ../libmateweather/weather.c:236
 msgid "North - Northwest"
-msgstr ""
-
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "የማይሰራ"
+msgstr "ሰሜን - ወደ ሰሜን ምዕራብ"
 
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
-msgstr ""
+msgstr "የጠራ ሰማይ "
 
 #: ../libmateweather/weather.c:250
 msgid "Broken clouds"
-msgstr ""
+msgstr "የተሰባበሩ ደመናዎች "
 
 #: ../libmateweather/weather.c:251
 msgid "Scattered clouds"
-msgstr ""
+msgstr "የተበታተኑ ደመናዎች "
 
 #: ../libmateweather/weather.c:252
 msgid "Few clouds"
-msgstr ""
+msgstr "ጥቂት ደመናዎች"
 
 #: ../libmateweather/weather.c:253
 msgid "Overcast"
@@ -520,15 +505,15 @@ msgstr "ዝናብ"
 
 #: ../libmateweather/weather.c:294
 msgid "Light rain"
-msgstr ""
+msgstr "ቀላል ዝናብ "
 
 #: ../libmateweather/weather.c:294
 msgid "Moderate rain"
-msgstr ""
+msgstr "መካከለኛ ዝናብ "
 
 #: ../libmateweather/weather.c:294
 msgid "Heavy rain"
-msgstr ""
+msgstr "ከባድ ዝናብ "
 
 #: ../libmateweather/weather.c:294
 msgid "Rain showers"
@@ -652,12 +637,12 @@ msgstr ""
 #. MIST
 #: ../libmateweather/weather.c:302
 msgid "Mist"
-msgstr ""
+msgstr "ጤዛ "
 
 #. FOG
 #: ../libmateweather/weather.c:303
 msgid "Fog"
-msgstr ""
+msgstr "ጭጋግ "
 
 #: ../libmateweather/weather.c:303
 msgid "Fog in the vicinity"
@@ -673,7 +658,7 @@ msgstr ""
 
 #: ../libmateweather/weather.c:303
 msgid "Partial fog"
-msgstr ""
+msgstr "በከፊል ጭጋጋማ "
 
 #: ../libmateweather/weather.c:303
 msgid "Freezing fog"
@@ -692,11 +677,11 @@ msgstr ""
 #. SAND
 #: ../libmateweather/weather.c:306
 msgid "Sand"
-msgstr ""
+msgstr "አሸዋ "
 
 #: ../libmateweather/weather.c:306
 msgid "Blowing sand"
-msgstr ""
+msgstr "የአሸዋ ንፋስ "
 
 #: ../libmateweather/weather.c:306
 msgid "Drifting sand"
@@ -715,11 +700,11 @@ msgstr ""
 #. DUST
 #: ../libmateweather/weather.c:309
 msgid "Dust"
-msgstr ""
+msgstr "አቧራ "
 
 #: ../libmateweather/weather.c:309
 msgid "Blowing dust"
-msgstr ""
+msgstr "አቧራማ ነፋስ "
 
 #: ../libmateweather/weather.c:309
 msgid "Drifting dust"
@@ -801,28 +786,28 @@ msgstr "ያልታወቀ"
 #: ../libmateweather/weather.c:761
 #, c-format
 msgid "%.1f °F"
-msgstr ""
+msgstr "%.1f °ፋ "
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
 #. U+00B0 DEGREE SIGN)
 #: ../libmateweather/weather.c:764
 #, c-format
 msgid "%d °F"
-msgstr ""
+msgstr "%d °ፋ "
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
 #. DEGREE SIGN)
 #: ../libmateweather/weather.c:770
 #, c-format
 msgid "%.1f °C"
-msgstr ""
+msgstr "%.1f °ሴ "
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
 #. DEGREE SIGN)
 #: ../libmateweather/weather.c:773
 #, c-format
 msgid "%d °C"
-msgstr ""
+msgstr "%d °ሴ "
 
 #. TRANSLATOR: This is the temperature in kelvin
 #: ../libmateweather/weather.c:779
@@ -840,7 +825,7 @@ msgstr ""
 #: ../libmateweather/weather.c:864
 #, c-format
 msgid "%.f%%"
-msgstr ""
+msgstr "%.f%%"
 
 #. TRANSLATOR: This is the wind speed in knots
 #: ../libmateweather/weather.c:892
@@ -852,19 +837,19 @@ msgstr ""
 #: ../libmateweather/weather.c:896
 #, c-format
 msgid "%.1f mph"
-msgstr ""
+msgstr "%.1f ሚበሰ "
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
 #: ../libmateweather/weather.c:900
 #, c-format
 msgid "%.1f km/h"
-msgstr ""
+msgstr "%.1f ኪሜ/ሰ "
 
 #. TRANSLATOR: This is the wind speed in meters per second
 #: ../libmateweather/weather.c:904
 #, c-format
 msgid "%.1f m/s"
-msgstr ""
+msgstr "%.1f ሚ/ሰ "
 
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
@@ -882,7 +867,7 @@ msgstr ""
 #: ../libmateweather/weather.c:939
 #, c-format
 msgid "%s / %s"
-msgstr ""
+msgstr "%s / %s"
 
 #. TRANSLATOR: This is pressure in inches of mercury
 #: ../libmateweather/weather.c:961
@@ -924,13 +909,13 @@ msgstr ""
 #: ../libmateweather/weather.c:1009
 #, c-format
 msgid "%.1f miles"
-msgstr ""
+msgstr "%.1f ማይሎች "
 
 #. TRANSLATOR: This is the visibility in kilometers
 #: ../libmateweather/weather.c:1013
 #, c-format
 msgid "%.1f km"
-msgstr ""
+msgstr "%.1f ኪሚ "
 
 #. TRANSLATOR: This is the visibility in meters
 #: ../libmateweather/weather.c:1017
diff --git a/po/ar.po b/po/ar.po
index 63310ee..5fc4538 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -14,373 +14,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-28 00:50+0000\n"
-"Last-Translator: noureddin <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/MATE/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "المبدئي"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "ك"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "م"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "ف"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "غير صحيح"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "م/ث"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "كم/ث"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "ميل/س"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "عقدة"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "مقياس بيوفور"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "ك.باسكال"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "ه‍.باسكال"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "ميلي بار"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "مم زئبق"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "بوصة زئبق"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "ض.ج."
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "م"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "كم"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "ميل"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "وقت جرينتش"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "رمز من ثلاثة أحرف لجلب خرائط رادار من weather.com، موجودة في http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "منطقة فريدة للمدينة، كما هي موجودة في http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "حدّث البيانات آليا"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "يحدد ما إذا يحدث البريمج إحصائياته عن حالة الطقس أم لا."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "اعرض خريطة الرادار"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "وحدة المسافة"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "فترة التحديث"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "احصل على خريطة رادار مع كل تحديث."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "المدة بالثانية بين التحديثات الآلية."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "إذا ضبط لصحيح، ستسحب خارطة رادار من الموقع المحدّد في المفتاح  \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "ا_ستخدم وحدات النظام المتري"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "خطوط الطول والعرض للموقع في بلدك بشكل: DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ا_ستخدم وحدات النظام المتري بدل النظام الانجليزي"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "إحداثيات الموقع"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "مدينة قريبة"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "وحدة المسافة"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "منطقة قريبة كبيرة ، كالعاصمة ، وجدت في http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "لم يعد مستخدما"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "وحدة الضغط"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "موقع الرادار"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "وحدة السرعة"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "وحدة الحرارة"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "المدينة التي يعرض بريمج الطقس معلومات عنها."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "العنوان الخاص الذي يحصل منه على خريطة الرادار."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "لم يعد مستخدما"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "المدة بالثانية بين التحديثات الآلية."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "اعرض خريطة الرادار"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "الوحدة التي ستستخدم للضغط."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "احصل على خريطة رادار مع كل تحديث."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "الوحدة التي ستستخدم للحرارة."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "الوحدة التي ستستخدم للرؤية."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "معلومات موقع الطقس"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "الوحدة التي ستستخدم لسرعة الرياح."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "معلومات موقع الطقس."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "فترة التحديث"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "حدّث البيانات آليا"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "مدينة قريبة"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "مسار خريطة الرادار"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "اس_تخدم مسارا خاصا لخريطة الرادار"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "ا_ستخدم وحدات النظام المتري"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "موقع المنطقة"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ا_ستخدم وحدات النظام المتري بدل النظام الانجليزي"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "موقع الرادار"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "طقس مدينة"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "معلومات موقع الطقس"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "المدينة التي يعرض بريمج الطقس معلومات عنها."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "معلومات موقع الطقس."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "موقع المنطقة"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "إحداثيات الموقع"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "خطوط الطول والعرض للموقع في بلدك بشكل: DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "اس_تخدم مسارا خاصا لخريطة الرادار"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "إذا ضبط لصحيح، ستسحب خارطة رادار من الموقع المحدّد في المفتاح  \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "مسار خريطة الرادار"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "العنوان الخاص الذي يحصل منه على خريطة الرادار."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -465,11 +454,6 @@ msgstr "شمال غربي"
 msgid "North - Northwest"
 msgstr "شمال - شمال غربي"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "غير صحيح"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "سماء صافية"
diff --git a/po/as.po b/po/as.po
index 857ce1b..f3e6f2f 100644
--- a/po/as.po
+++ b/po/as.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: as\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "কলকাতা"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VECC"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "22°33′N 88°20′E "
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "অৱিকল্পিত"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "অৱৈধ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "গ্ৰিনউইচ মিন সময়"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com ৰ পৰা ৰেডাৰ মেপ প্ৰাপ্ত কৰাৰ বাবে ব্যবহৃত তিন-অক্ষৰ-বিশিষ্ট কোড।  http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ৰ পৰা প্ৰাপ্ত"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "ছহৰৰ অঞ্চল চিহ্নকাৰী অঞ্চল, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ৰ পৰা প্ৰাপ্ত"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "স্বয়ংক্ৰিয়ৰূপে তথ্য উন্নত কৰা হ'ব"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "এপ্লেট দ্বাৰা স্বয়ংক্ৰিয়ৰূপে বতৰ সংক্ৰান্ত পৰিসংখ্যা উন্নত কৰা হ'ব নে নহয় নিৰ্ধাৰণ কৰিবলৈ ব্যৱহৃত ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "ৰেডাৰ মেপ প্ৰদৰ্শন কৰা হ'ব"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "দূৰত্ব মাপৰ একক"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "উন্নয়নত বিৰতী"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "প্ৰত্যেক উন্নয়নত এটা ৰেডাৰ মেৰ পাব ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "স্বয়ংক্ৰিয় উন্নয়নৰ মধ্যবৰ্তী বিৰতি, ছেকেণ্ডত ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "মান true হ'লে \"radar\" চাবিৰ দ্বাৰা চিহ্নিত অবস্থানৰ পৰা ৰেডাৰ মেপ প্ৰাপ্ত কৰা হ'ব ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "মেট্ৰিক একক ব্যৱহৃত হ'ব"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "DD-MM-SS[NS] DD-MM-SS[EW] ত উল্লিখিত আপোনাৰ অৱস্থানৰ অক্ষাংশ আৰু দ্ৰাঘিমা ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ইংৰাজী এককৰ পৰিবৰ্তে মেট্ৰিক একক ব্যৱহৃত হ'ব"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "অৱস্থানৰ স্থানাঙ্ক"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "পাৰ্শ্ববৰ্তী চহৰ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "দূৰত্ব মাপৰ একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "বৰ্তমানে অব্যৱহৃত"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "বায়ুচাপৰ একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ৰেডাৰৰ অৱস্থান"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "গতিৰ একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "তাপমাত্ৰাৰ একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather দ্বাৰা যি চহৰৰ তথ্য প্ৰদৰ্শিত হয় ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ৰেডাৰ মেৰ উদ্ধাৰ কৰিব লগা স্বনিৰ্বাচিত url ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "বৰ্তমানে অব্যৱহৃত"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "স্বয়ংক্ৰিয় উন্নয়নৰ মধ্যবৰ্তী বিৰতি, ছেকেণ্ডত ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "ৰেডাৰ মেপ প্ৰদৰ্শন কৰা হ'ব"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "চাপ মাপৰ একক ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "প্ৰত্যেক উন্নয়নত এটা ৰেডাৰ মেৰ পাব ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "তাপমাত্ৰা মাপৰ একক ।"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "দৃষ্টিসীমা মাপৰ বাবে ব্যৱহৃত একক ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "অৱস্থানৰ বতৰ সংক্ৰান্ত তথ্য"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "বায়ুৰ গতি মাপৰ একক ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "অৱস্থানৰ বতৰ সংক্ৰান্ত তথ্য ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "উন্নয়নত বিৰতী"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "স্বয়ংক্ৰিয়ৰূপে তথ্য উন্নত কৰা হ'ব"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "পাৰ্শ্ববৰ্তী চহৰ"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "ৰেডাৰ মেপৰ Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ৰেডাৰ মেপৰ বাবে স্বনিৰ্বাচিত url ব্যৱহৃত হ'ব"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "মেট্ৰিক একক ব্যৱহৃত হ'ব"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "অঞ্চলৰ অৱস্থান"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ইংৰাজী এককৰ পৰিবৰ্তে মেট্ৰিক একক ব্যৱহৃত হ'ব"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ৰেডাৰৰ অৱস্থান"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "এটা চহৰৰ বতৰ"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "অৱস্থানৰ বতৰ সংক্ৰান্ত তথ্য"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather দ্বাৰা যি চহৰৰ তথ্য প্ৰদৰ্শিত হয় ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "অৱস্থানৰ বতৰ সংক্ৰান্ত তথ্য ।"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "অঞ্চলৰ অৱস্থান"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "অৱস্থানৰ স্থানাঙ্ক"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "DD-MM-SS[NS] DD-MM-SS[EW] ত উল্লিখিত আপোনাৰ অৱস্থানৰ অক্ষাংশ আৰু দ্ৰাঘিমা ।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ৰেডাৰ মেপৰ বাবে স্বনিৰ্বাচিত url ব্যৱহৃত হ'ব"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "মান true হ'লে \"radar\" চাবিৰ দ্বাৰা চিহ্নিত অবস্থানৰ পৰা ৰেডাৰ মেপ প্ৰাপ্ত কৰা হ'ব ।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "ৰেডাৰ মেপৰ Url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ৰেডাৰ মেৰ উদ্ধাৰ কৰিব লগা স্বনিৰ্বাচিত url ।"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "উত্তৰপশ্চিম"
 msgid "North - Northwest"
 msgstr "উত্তৰ - উত্তৰপশ্চিম"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "অৱৈধ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "পৰিষ্কাৰ আকাশ"
diff --git a/po/ast.po b/po/ast.po
index 790b6cf..393f06a 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,373 +7,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/MATE/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ast\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Asturies/Avilés"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LEAS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "\" \""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "LEMD"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Por defeutu"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nun val"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ñudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Hora media de Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un códigu de tres díxitos pa sacar los mapes de radar dende weather.com, tal como los que tán en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un estaya única pa la ciudá, tal como ta en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Anovar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si l'aplicación anova automáticamente los datos del tiempu o non."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Amosar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidá de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalu d'actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar en cada anovamientu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "L'intervalu, en segundos, ente anovamientos automáticos."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si ye \"true\" (verdá), entós apurre un mapa de radar dende les señes que se-y dió pola clave \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidaes métriques"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Llatitú y llonxitú de la so zona espresada en GG-MM-SS[NS] GG-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usar unidaes métriques n'arróu d'unidaes ingleses."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenaes de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudá cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidá de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Estaya mayor más averada, como una capital, tal como ta en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Yá nun s'usa"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidá de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Llocalización del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidá de velocidá"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidá de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudá pa la que mateweather amuesa información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada pa sacar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Yá nun s'usa"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "L'intervalu, en segundos, ente anovamientos automáticos."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Amosar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidá na que midir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar en cada anovamientu"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidá na que midir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidá na que midir la visibilidá."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorolóxica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidá na que midir la velocidá del vientu."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorolóxica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalu d'actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Anovar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudá cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url pal mapa de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usar url personalizada pal mapa de radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidaes métriques"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Allugamientu de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usar unidaes métriques n'arróu d'unidaes ingleses."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Llocalización del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteoroloxía pa una ciudá"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorolóxica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudá pa la que mateweather amuesa información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorolóxica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Allugamientu de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenaes de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Llatitú y llonxitú de la so zona espresada en GG-MM-SS[NS] GG-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usar url personalizada pal mapa de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si ye \"true\" (verdá), entós apurre un mapa de radar dende les señes que se-y dió pola clave \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url pal mapa de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada pa sacar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -458,11 +447,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte -Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nun val"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielu espeyáu"
diff --git a/po/az.po b/po/az.po
index 3b572b3..a945686 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,374 +9,363 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: az\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "New York-JFK Arpt"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "KJFK"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "NYZ076"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "nyc"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Ön Qurğulu"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Hökmsüz"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "kPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Mə'lumatı avtomatik olaraq yenilə"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Appletin avtomatik olaraq hava təxminlərini yeniləməsini müəyyən edir."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Radar xəritəsini göstər"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Yeniləmə aralığı"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Avtomatik yeniləmələr arasındakı saniyə olaraq aralıq."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Metrik sistem vahidllərini işlət"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "İngilis vahidləri yerinə metrik vahidllərini işlət"
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hər yeniləmədə radar xəritəsini öyrən."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "Artıq istifadə edilmir"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Radar xəritəsini göstər"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hər yeniləmədə radar xəritəsini öyrən."
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Radar xəritəsinin alınması üçün xüsusi url."
-
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Avtomatik yeniləmələr arasındakı saniyə olaraq aralıq."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "İşlədiləcək təzyiq vahidi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "İşlədiləcək görünüş vahidi."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "İşlədiləcək külək sürəti vahidi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Yeniləmə aralığı"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Mə'lumatı avtomatik olaraq yenilə"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Radar xəritəsi üçün url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Radar xəritəsi üçün xüsusi url işlət"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Metrik sistem vahidllərini işlət"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "İngilis vahidləri yerinə metrik vahidllərini işlət"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Radar xəritəsi üçün xüsusi url işlət"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Radar xəritəsi üçün url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Radar xəritəsinin alınması üçün xüsusi url."
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -460,11 +449,6 @@ msgstr "Şimali Qərb"
 msgid "North - Northwest"
 msgstr "Şimal - Şimali Qərb"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Hökmsüz"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Açıq Göyüzü"
diff --git a/po/be.po b/po/be.po
index bac662c..7c5b7b7 100644
--- a/po/be.po
+++ b/po/be.po
@@ -11,373 +11,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Менск"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "UMMS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Прадвызначаныя"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Няправільны"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "м/с"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "км/г"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "мілі за гадзіну"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "вузлы"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Шкала Бафорта"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "кіляпаскалі"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "гектапаскалі"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "мілібары"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "мілібары мэркура"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "дзюймы мэркура"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "атмасфэры"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "м"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "км"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "мілі"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Сярэдні час па Грынвічу"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Трохлічбавы код Вашай мясцовасьці для атрыманьня зьвестак з weather.com. Яго можна знайсьці ў http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Унікальныя зона гораду, якую можна знайсьці ў http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Абнаўляць даньні аўтаматычна"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Вызначае, ці абнаўляе аўтаматычна аплет зьвесткі пра надвор'е ці не."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Паказваць радарную мапу"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Адзінка адлегласьці"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Хуткасьць абнаўленьня"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Атрымліваць радарную мапу падчас кожнага абнаўленьня."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Прамежак часу, у сэкундах, паміх аўтаматычнымі абнаўленьнямі."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Калі ісьціна, атрымлівае радарную мапу з знаходжаньня, якое вызначаецца ключом \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Выкарыстоўваць мэтрычныя адзінкі"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Шырата і даўгата вашай мясцовасьці, напісаныя ў фармаце DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Выкарыстоўваць мэтрычныя адзінкі замест ангельскіх."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Каардынаты мясцовасьці"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Найбліжэйшы горад"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Адзінка адлегласьці"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Больш не выкарыстоўваецца"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Адзінка ціску"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Мясцовасьць радара"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Адзінка хуткасьці"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Адзінка тэмпэратуры"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Горад, для якога паказваюцца зьвесткі."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Адмысловы url, адкуль атрымліваць радарную мапу."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Больш не выкарыстоўваецца"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Прамежак часу, у сэкундах, паміх аўтаматычнымі абнаўленьнямі."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Паказваць радарную мапу"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Адзінка, якую трэба выкарыстоўваць для ціску."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Атрымліваць радарную мапу падчас кожнага абнаўленьня."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Адзінка, якую трэба выкарыстоўваць для тэмпэратуры."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Адзінка, якую трэба выкарыстоўваць для бачнасьці."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Зьвесткі надвор'я мясцовасьці"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Адзінка, якую трэба выкарыстоўваць для хуткасьці ветру."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Зьвесткі надвор'я мясцовасьці."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Хуткасьць абнаўленьня"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Абнаўляць даньні аўтаматычна"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Найбліжэйшы горад"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL радарнай мапы"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Выкарыстоўваць адмысловы url для радарнай мапы"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Выкарыстоўваць мэтрычныя адзінкі"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Мясцовасьць зоны"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Выкарыстоўваць мэтрычныя адзінкі замест ангельскіх."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Мясцовасьць радара"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Прагноз надвор'я для гораду"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Зьвесткі надвор'я мясцовасьці"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Горад, для якога паказваюцца зьвесткі."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Зьвесткі надвор'я мясцовасьці."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Мясцовасьць зоны"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Каардынаты мясцовасьці"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Шырата і даўгата вашай мясцовасьці, напісаныя ў фармаце DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Выкарыстоўваць адмысловы url для радарнай мапы"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Калі ісьціна, атрымлівае радарную мапу з знаходжаньня, якое вызначаецца ключом \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL радарнай мапы"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Адмысловы url, адкуль атрымліваць радарную мапу."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -462,11 +451,6 @@ msgstr "Паўночна-Заходні"
 msgid "North - Northwest"
 msgstr "Паўночны - Паўночна-Заходні"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Няправільны"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Яснае неба"
diff --git a/po/bg.po b/po/bg.po
index b566bf4..15822f2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,378 +8,368 @@
 # Rostislav "zbrox" Raykov <[email protected]>, 2004, 2005, 2006.
 # Vladimir Petkov <[email protected]>, 2004, 2005.
 # Yanko Kaneti <[email protected]>, 2003.
+# Yasen Pramatarov <[email protected]>, 2012.
 # Yavor Doganov <[email protected]>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/MATE/language/bg/)\n"
+"Language-Team: Bulgarian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "София"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LBSF"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "42-39N 023-23E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "стандартна"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "℃"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "℉"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Невалиден"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "м/сек"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "км/ч"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "мили/ч"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "възли"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ска̀ла на Бофорт"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "кПа"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "хПа"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "атмосфери"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "м"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "км"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "мили"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "По Гринуич"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Трицифрен код за получаването на радарни карти от weather.com. Проверете го в http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Уникална зона в града. Проверете го в http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Автоматично обновяване на данните"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Определяне дали аплетът автоматично да обновява статистиките за времето или не."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Показване на радарната карта"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Единици за разстояние"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Интервал на обновяване"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Изтегляне на радарната карта при всяко обновяване."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Интервал в секунди между автоматичните обновявания."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ако е истина, информацията за радарната карта се взима от местоположението определено от ключа „radar“."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Използване на метричната система"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Географската ширина и дължина на местоположението ви изразена в ГГ-ММ-СС [северна ширина] и ГГ-ММ-СС [източна дължина]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Използване на метричната система вместо английската."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Координати на местоположението"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Близък град"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Единици за разстояние"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Не се използва вече"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Единици за налягане"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Местоположение на радара"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Единици за скорост"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Единици за температура"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Градът, за който mateweather показва информация."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Друг адрес, от който да се търси информация за радарната карта."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Не се използва вече"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Интервал в секунди между автоматичните обновявания."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Показване на радарната карта"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Единицата за налягане, която да се ползва."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Изтегляне на радарната карта при всяко обновяване."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Единицата за температура, която да се ползва."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Единицата за видимост, която да се ползва."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Информация за времето в дадено местоположение"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Единицата за скорост на вятъра, която да се ползва."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Информация за времето в дадено местоположение."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Интервал на обновяване"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Автоматично обновяване на данните"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Близък град"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Интернет адрес за радарната карта"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Използване на друг адрес в Интернет за радарна карта"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Използване на метричната система"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Местоположение на зоната"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Използване на метричната система вместо английската."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Местоположение на радара"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Прогноза на времето за град"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Информация за времето в дадено местоположение"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Градът, за който mateweather показва информация."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Информация за времето в дадено местоположение."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Местоположение на зоната"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Координати на местоположението"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Географската ширина и дължина на местоположението ви изразена в ГГ-ММ-СС [северна ширина] и ГГ-ММ-СС [източна дължина]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Използване на друг адрес в Интернет за радарна карта"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ако е истина, информацията за радарната карта се взима от местоположението определено от ключа „radar“."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Интернет адрес за радарната карта"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Друг адрес, от който да се търси информация за радарната карта."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -464,11 +454,6 @@ msgstr "Северозапад"
 msgid "North - Northwest"
 msgstr "Север — северозапад"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Невалиден"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ясно небе"
diff --git a/po/bn.po b/po/bn.po
index 480cccc..7da8747 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -13,373 +13,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bn\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "বাংলাদেশ"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VECC"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "22°33′N 88°20′E "
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ডিফল্ট"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "অবৈধ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "মিটার/সেকেন্ড"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "কিলোমিটার/ঘন্টা"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "নট"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "মি"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "কিলোমিটার"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "মিলিমিটার"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "গ্রীণউইচ মধ্যমান"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com থেকে রেডার ম্যাপ প্রাপ্ত করার জন্য ব্যবহৃত তিন-অক্ষর-বিশিষ্ট কোড। http://cvs.gnome.org/viewcvs/*checkout*/mate-applets/mateweather/Locations.xml.in থেকে প্রাপ্ত"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "শহরের অঞ্চল চিহ্নকারী জোন, http://cvs.gnome.org/viewcvs/*checkout*/mate-applets/mateweather/Locations.xml.in থেকে প্রাপ্ত"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "স্বয়ংক্রিয়রূপে তথ্য আপডেট করা হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "অ্যাপ্লেট দ্বারা স্বয়ংক্রিয়রূপে আবহাওয়া সংক্রান্ত পরিসংখ্যান আপডেট করা হবে কিনা নির্ধারণ করতে ব্যবহৃত।"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "রেডার ম্যাপ প্রদর্শন করা হবে"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "দূরত্ব মাপার একক"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "আপডেটের মধ্যে বিরতী"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "প্রতিটি আপডেটের সময় রেডার ম্যাপ প্রাপ্ত করা হবে।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "স্বয়ংক্রিয় আপডেটের মধ্যবর্তী বিরতি, সেকেন্ডে।"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "মান true (সত্য) হলে \"radar\"-কি দ্বারা চিহ্নিত অবস্থান থেকে রেডার ম্যাপ প্রাপ্ত করা হবে।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "মেট্রিক একক ব্যবহৃত হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "DD-MM-SS[NS] DD-MM-SS[EW]'এ উল্লিখিত আপনার অবস্থানের অক্ষাংশ ও দ্রাঘিমা।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ইংরেজ এককের পরিবর্তে মেট্রিক একক ব্যবহৃত হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "অবস্থানের স্থানাঙ্ক"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "পার্শ্ববর্তী সহর"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "দূরত্ব মাপার একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "বর্তমানে অব্যবহৃত"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "বায়ুচাপের একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "রেডারের অবস্থান"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "গতির একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "তাপমাত্রার একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather দ্বারা যে শহরের তথ্যে প্রদর্শিত হয়।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "রেডার ম্যাপ প্রাপ্তির উদ্দেশ্যে ব্যবহৃত স্বনির্বাচিত url।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "বর্তমানে অব্যবহৃত"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "স্বয়ংক্রিয় আপডেটের মধ্যবর্তী বিরতি, সেকেন্ডে।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "রেডার ম্যাপ প্রদর্শন করা হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "চাপ মাপার একক।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "প্রতিটি আপডেটের সময় রেডার ম্যাপ প্রাপ্ত করা হবে।"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "তাপমাত্রা মাপার একক।"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "দৃষ্টিসীমা মাপার জন্য ব্যবহৃত একক।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "বায়ুর গতি মাপার একক।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য।"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "আপডেটের মধ্যে বিরতী"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "স্বয়ংক্রিয়রূপে তথ্য আপডেট করা হবে"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "পার্শ্ববর্তী সহর"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "রেডার ম্যাপের Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "রেডার ম্যাপের জন্য স্বনির্বাচিত url ব্যবহৃত হবে"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "মেট্রিক একক ব্যবহৃত হবে"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "অঞ্চলের অবস্থান"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ইংরেজ এককের পরিবর্তে মেট্রিক একক ব্যবহৃত হবে"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "রেডারের অবস্থান"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "শহরের আবহাওয়া"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather দ্বারা যে শহরের তথ্যে প্রদর্শিত হয়।"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য।"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "অঞ্চলের অবস্থান"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "অবস্থানের স্থানাঙ্ক"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "DD-MM-SS[NS] DD-MM-SS[EW]'এ উল্লিখিত আপনার অবস্থানের অক্ষাংশ ও দ্রাঘিমা।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "রেডার ম্যাপের জন্য স্বনির্বাচিত url ব্যবহৃত হবে"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "মান true (সত্য) হলে \"radar\"-কি দ্বারা চিহ্নিত অবস্থান থেকে রেডার ম্যাপ প্রাপ্ত করা হবে।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "রেডার ম্যাপের Url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "রেডার ম্যাপ প্রাপ্তির উদ্দেশ্যে ব্যবহৃত স্বনির্বাচিত url।"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -464,11 +453,6 @@ msgstr "উত্তরপশ্চিম"
 msgid "North - Northwest"
 msgstr "উত্তর - উত্তরপশ্চিম"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "অবৈধ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "মেঘমুক্ত আকাশ"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 9257e40..b77d2f5 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -9,377 +9,367 @@
 # Runa Bhattacharjee <[email protected]>, 2008, 2009.
 # Samia Niamatullah <[email protected]>, 2005.
 # Sayamindu Dasgupta <[email protected]>, 2003.
+# Umesh Agarwal <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/MATE/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bn_IN\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "কলকাতা"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VECC"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "22°33′N 88°20′E "
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ডিফল্ট"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "কেলভিন"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "সেন্টিগ্রেড"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "ফ্যারেনহাইট"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "অবৈধ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "মিটার/সেকেন্ড"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "কিলোমিটার/ঘন্টা"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "নট"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "মিটার"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "কিলোমিটার"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "মাইল"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "গ্রিনউইচ মিন সময়"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com থেকে রেডার ম্যাপ প্রাপ্ত করার জন্য ব্যবহৃত তিন-অক্ষর-বিশিষ্ট কোড।  http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in থেকে প্রাপ্ত"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "শহরের অঞ্চল চিহ্নকারী জোন, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in থেকে প্রাপ্ত"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "স্বয়ংক্রিয়রূপে তথ্য আপডেট করা হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "অ্যাপ্লেট দ্বারা স্বয়ংক্রিয়রূপে আবহাওয়া সংক্রান্ত পরিসংখ্যান আপডেট করা হবে কিনা নির্ধারণ করতে ব্যবহৃত।"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "রেডার ম্যাপ প্রদর্শন করা হবে"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "দূরত্ব মাপার একক"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "আপডেটের মধ্যে বিরতী"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "প্রতিটি আপডেটের সময় রেডার ম্যাপ প্রাপ্ত করা হবে।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "স্বয়ংক্রিয় আপডেটের মধ্যবর্তী বিরতি, সেকেন্ডে।"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "মান true (সত্য) হলে \"radar\"-কি দ্বারা চিহ্নিত অবস্থান থেকে রেডার ম্যাপ প্রাপ্ত করা হবে।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "মেট্রিক একক ব্যবহৃত হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "DD-MM-SS[NS] DD-MM-SS[EW]'এ উল্লিখিত আপনার অবস্থানের অক্ষাংশ ও দ্রাঘিমা।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ইংরেজ এককের পরিবর্তে মেট্রিক একক ব্যবহৃত হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "অবস্থানের স্থানাঙ্ক"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "পার্শ্ববর্তী সহর"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "দূরত্ব মাপার একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "বর্তমানে অব্যবহৃত"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "বায়ুচাপের একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "রেডারের অবস্থান"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "গতির একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "তাপমাত্রার একক"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather দ্বারা যে শহরের তথ্যে প্রদর্শিত হয়।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "রেডার ম্যাপ প্রাপ্তির উদ্দেশ্যে ব্যবহৃত স্বনির্বাচিত url।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "বর্তমানে অব্যবহৃত"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "স্বয়ংক্রিয় আপডেটের মধ্যবর্তী বিরতি, সেকেন্ডে।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "রেডার ম্যাপ প্রদর্শন করা হবে"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "চাপ মাপার একক।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "প্রতিটি আপডেটের সময় রেডার ম্যাপ প্রাপ্ত করা হবে।"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "তাপমাত্রা মাপার একক।"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "দৃষ্টিসীমা মাপার জন্য ব্যবহৃত একক।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "বায়ুর গতি মাপার একক।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য।"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "আপডেটের মধ্যে বিরতী"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "স্বয়ংক্রিয়রূপে তথ্য আপডেট করা হবে"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "পার্শ্ববর্তী সহর"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "রেডার ম্যাপের Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "রেডার ম্যাপের জন্য স্বনির্বাচিত url ব্যবহৃত হবে"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "মেট্রিক একক ব্যবহৃত হবে"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "অঞ্চলের অবস্থান"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ইংরেজ এককের পরিবর্তে মেট্রিক একক ব্যবহৃত হবে"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "রেডারের অবস্থান"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "শহরের আবহাওয়া"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather দ্বারা যে শহরের তথ্যে প্রদর্শিত হয়।"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "অবস্থানের আবহওয়া সংক্রান্ত তথ্য।"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "অঞ্চলের অবস্থান"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "অবস্থানের স্থানাঙ্ক"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "DD-MM-SS[NS] DD-MM-SS[EW]'এ উল্লিখিত আপনার অবস্থানের অক্ষাংশ ও দ্রাঘিমা।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "রেডার ম্যাপের জন্য স্বনির্বাচিত url ব্যবহৃত হবে"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "মান true (সত্য) হলে \"radar\"-কি দ্বারা চিহ্নিত অবস্থান থেকে রেডার ম্যাপ প্রাপ্ত করা হবে।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "রেডার ম্যাপের Url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "রেডার ম্যাপ প্রাপ্তির উদ্দেশ্যে ব্যবহৃত স্বনির্বাচিত url।"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -464,11 +454,6 @@ msgstr "উত্তরপশ্চিম"
 msgid "North - Northwest"
 msgstr "উত্তর - উত্তরপশ্চিম"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "অবৈধ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "মেঘমুক্ত আকাশ"
diff --git a/po/br.po b/po/br.po
index 851c4b8..6ba0860 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,372 +8,361 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: br\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Roazhon"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LFRN"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr ""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "48.066667 -1.733333"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Dre ziouer"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "°C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Didalvoudek"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr ""
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr ""
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "skeuliad Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
+#: ../libmateweather/mateweather-timezone.c:314
+msgid "Greenwich Mean Time"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
 msgstr ""
 
-#: ../libmateweather/mateweather-timezone.c:314
-msgid "Greenwich Mean Time"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:8
-msgid ""
-"Determines whether the applet automatically updates its weather statistics "
-"or not."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "Unanenn tizh"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Unanenn gwrezverk"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "N'eo ket ken implijet"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
-msgstr "Unanenn tizh"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr "Unanenn gwrezverk"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
 msgstr ""
 
 #: ../libmateweather/timezone-menu.c:277
@@ -459,11 +448,6 @@ msgstr ""
 msgid "North - Northwest"
 msgstr ""
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Didalvoudek"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 065b8e8..2bb1e28 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,374 +8,363 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Sarajevo"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LQSA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Uobičajeno"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nevažeće"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "čvorova"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Ažuriraj podatke automatski"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Odlučuje da li aplet automatski ažurira vremensku statistiku ili ne."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Prikaži radarsku kartu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval ažuriranja"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Interval, u sekundama, između automatskih ažuriranja."
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Koristi metričke jedinice"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Koristi metričke jedinice umjesto engleskih."
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Dobavi radarsku kartu pri svakom ažuriranju."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "Nije više u upotrebi"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Prikaži radarsku kartu"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Dobavi radarsku kartu pri svakom ažuriranju."
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Vlastiti url sa kojeg će se dobaviti radarska karta."
-
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Interval, u sekundama, između automatskih ažuriranja."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Jedinica koja će se koristiti za tlak."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Jedinica koja će se koristiti za vidljivost."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Jedinica koja će se koristiti za brzinu vjetra."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval ažuriranja"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Ažuriraj podatke automatski"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url za radarsku mapu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Koristi vlastiti url za radarsku mapu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Koristi metričke jedinice"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Koristi metričke jedinice umjesto engleskih."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Koristi vlastiti url za radarsku mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url za radarsku mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Vlastiti url sa kojeg će se dobaviti radarska karta."
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -459,11 +448,6 @@ msgstr "Sjeverozapad"
 msgid "North - Northwest"
 msgstr "Sjever - sjeverozapad"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nevažeće"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Vedro"
diff --git a/po/ca.po b/po/ca.po
index 06e0826..6195a56 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,373 +14,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-08 20:10+0000\n"
-"Last-Translator: Pere Orga <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/MATE/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Barcelona"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LEBL"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "41.383333 2.183333"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Per defecte"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Invàlid"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nusos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala de Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "poHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Hora mitja de Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un codi de tres xifres per a obtenir mapes de radar de weather.com, com apareix a http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Una zona única per a la ciutat, com apareix a http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualitza les dades automàticament"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicació actualitza automàticament les estadístiques de l'oratge o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostra el mapa del radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unitats de distància"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval d'actualització"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obté un mapa del radar en cada actualització."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "L'interval, en segons, entre actualitzacions automàtiques."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si és cert, obtingues un mapa del radar d'una ubicació especificada en la clau «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Utilitza unitats del sistema mètric"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud i longitud de la vostra ubicació expressada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Utilitza unitats del sistema mètric en comptes d'unitats anglosaxones."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenades de la ubicació"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciutat més propera"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unitats de distància"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "La zona propera més important, per exemple una capital de ciutat, com apareix a http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ja no s'utilitza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unitats de pressió"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Ubicació del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unitats de velocitat"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unitats de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "De quina ciutat mostra informació el mateweather."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "L'adreça personalitzada d'on obtenir un mapa del radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ja no s'utilitza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "L'interval, en segons, entre actualitzacions automàtiques."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostra el mapa del radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unitat a utilitzar per a la pressió."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obté un mapa del radar en cada actualització."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unitat a utilitzar per a la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unitat a utilitzar per a visibilitat."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informació de la ubicació del temps"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unitat a utilitzar per a velocitat del vent."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informació de la ubicació del temps."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval d'actualització"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualitza les dades automàticament"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciutat més propera"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Adreça per al mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Utilitza una adreça personalitzada per al mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Utilitza unitats del sistema mètric"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Ubicació de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Utilitza unitats del sistema mètric en comptes d'unitats anglosaxones."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Ubicació del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Informe del temps d'una ciutat"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informació de la ubicació del temps"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "De quina ciutat mostra informació el mateweather."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informació de la ubicació del temps."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Ubicació de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenades de la ubicació"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud i longitud de la vostra ubicació expressada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Utilitza una adreça personalitzada per al mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si és cert, obtingues un mapa del radar d'una ubicació especificada en la clau «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Adreça per al mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "L'adreça personalitzada d'on obtenir un mapa del radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -465,11 +454,6 @@ msgstr "Nord-oest"
 msgid "North - Northwest"
 msgstr "Nord - Nord-oest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Invàlid"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cel clar"
diff --git a/po/[email protected] b/po/[email protected]
index 8527ff0..945faec 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -13,373 +13,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca@valencia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Barcelona"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LEBL"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "41.383333 2.183333"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Per defecte"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Invàlid"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nusos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala de Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "poHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Hora mitja de Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un codi de tres xifres per a obtindre mapes de radar de weather.com, com apareix a http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Una zona única per a la ciutat, com apareix a http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualitza les dades automàticament"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicació actualitza automàticament les estadístiques de l'oratge o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostra el mapa del radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unitats de distància"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval d'actualització"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obté un mapa del radar en cada actualització."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "L'interval, en segons, entre actualitzacions automàtiques."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si és cert, obtingues un mapa del radar d'una ubicació especificada en la clau «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Utilitza unitats del sistema mètric"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud i longitud de la vostra ubicació expressada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Utilitza unitats del sistema mètric en comptes d'unitats anglosaxones."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenades de la ubicació"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciutat més propera"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unitats de distància"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ja no s'utilitza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unitats de pressió"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Ubicació del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unitats de velocitat"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unitats de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "De quina ciutat mostra informació el mateweather."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "L'adreça personalitzada d'on obtindre un mapa del radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ja no s'utilitza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "L'interval, en segons, entre actualitzacions automàtiques."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostra el mapa del radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unitat a utilitzar per a la pressió."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obté un mapa del radar en cada actualització."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unitat a utilitzar per a la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unitat a utilitzar per a visibilitat."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informació de la ubicació del temps"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unitat a utilitzar per a velocitat del vent."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informació de la ubicació del temps."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval d'actualització"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualitza les dades automàticament"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciutat més propera"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Adreça per al mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Utilitza una adreça personalitzada per al mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Utilitza unitats del sistema mètric"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Ubicació de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Utilitza unitats del sistema mètric en comptes d'unitats anglosaxones."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Ubicació del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Informe del temps d'una ciutat"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informació de la ubicació del temps"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "De quina ciutat mostra informació el mateweather."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informació de la ubicació del temps."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Ubicació de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenades de la ubicació"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud i longitud de la vostra ubicació expressada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Utilitza una adreça personalitzada per al mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si és cert, obtingues un mapa del radar d'una ubicació especificada en la clau «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Adreça per al mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "L'adreça personalitzada d'on obtindre un mapa del radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -464,11 +453,6 @@ msgstr "Nord-oest"
 msgid "North - Northwest"
 msgstr "Nord - Nord-oest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Invàlid"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cel clar"
diff --git a/po/crh.po b/po/crh.po
index ab9eb88..3ffcdca 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: crh\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Aqmescit"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "UKFF"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "44.683333 34.133333"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Ögbelgilengen"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Keçersiz"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/st"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mi/st"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knot"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort ölçeği"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "kPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Ortalama Zamanı"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Weather.com radar haritası almak için http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in konumundan bulunabilen üç basamaklı kod"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in içinde bulunabilen şehir için tekil alan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Verilerni avtomatik olaraq yañart"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Uyğulamaçıqnıñ ava durumı ihsaiyatını öz-özünden yañartıp yañartmağanını belgiler."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Radar haritasını köster"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Uzaklık birimi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Yañartma aralığı"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Er yañartma üzerine bir radar haritasını ketir."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Otomatik güncellemeler için, saniye cinsinden, aralık."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Eğer seçiliyse, \"radar\" anahtarında belirtilen konumdan radar haritası alır."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Metrik birimleri kullan"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Bulunduğunuz yer için DD-MM-SS[NS] DD-MM-SS [EW] şeklinde enlem ve boylam."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "İngiliz birimleri yerine metrik birimleri kullan."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Qonum koordinatları"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Yakındaki şehir"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Uzaklık birimi"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Artık kullanılmıyor"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Basım birlemi"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radar qonumı"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Sur'at birlemi"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Sıcaqlıq birlemi"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Gweather'in bilgisini gösterdiği şehir."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Radar haritasının alınacağı özel url."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Artık kullanılmıyor"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Otomatik güncellemeler için, saniye cinsinden, aralık."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Radar haritasını köster"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Kullanılacak basınç birimi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Er yañartma üzerine bir radar haritasını ketir."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Kullanılacak sıcaklık birimi."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Qullanılacaq körünirlik birlemi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Ava durumı qonum malümatı"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Kullanılacak rüzgar hızı birimi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Ava durumı qonum malümatı."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Yañartma aralığı"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Verilerni avtomatik olaraq yañart"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Yakındaki şehir"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Radar haritası için url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Radar haritası için özel adres kullan"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Metrik birimleri kullan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Alan bilgisi"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "İngiliz birimleri yerine metrik birimleri kullan."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar qonumı"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Şehir için hata durumu"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Ava durumı qonum malümatı"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Gweather'in bilgisini gösterdiği şehir."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Ava durumı qonum malümatı."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Alan bilgisi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Qonum koordinatları"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Bulunduğunuz yer için DD-MM-SS[NS] DD-MM-SS [EW] şeklinde enlem ve boylam."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Radar haritası için özel adres kullan"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Eğer seçiliyse, \"radar\" anahtarında belirtilen konumdan radar haritası alır."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Radar haritası için url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Radar haritasının alınacağı özel url."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Kuzeybatı"
 msgid "North - Northwest"
 msgstr "Kuzey - Kuzeybatı"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Keçersiz"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Açıq Kökyüzü"
diff --git a/po/cs.po b/po/cs.po
index 920e9e1..4428a03 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,373 +17,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/MATE/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Praha"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LKPR"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "50-05-20N 14-23-48E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Výchozí"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Neplatné"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "uzly"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufortova stupnice"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwichský střední čas"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Trojciferný kód satelitních snímků z weather.com, který můžete najít na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Unikátní kód pásma města, který můžete najít na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Aktualizovat data automaticky"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Určuje, jestli applet automaticky aktualizuje své statistiky počasí."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Zobrazovat radarovou mapu"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Jednotky vzdálenosti"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval aktualizace"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Stáhnout radarovou mapu při každé aktualizaci."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Interval v sekundách mezi automatickými aktualizacemi."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Je-li \"true\", získat radarovou mapu z polohy určené klíčem \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Používat metrické jednotky"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Zeměpisná šířka a délka vaší polohy vyjádřená jako DD-MM-SS[NS] DD-MM-SS[EW], tj. stupeň-minuta-vteřina[sever-jih], resp. [východ-západ]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Používat metrické jednotky místo anglosaských."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Souřadnice polohy"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Blízké město"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Jednotky vzdálenosti"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Již se nepoužívá"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Jednotky tlaku"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Poloha radaru"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Jednotky rychlosti"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Jednotky teploty"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Město, pro které mateweather zobrazuje informace."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Používat vlastní URL k získání radarové mapy."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Již se nepoužívá"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Interval v sekundách mezi automatickými aktualizacemi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Zobrazovat radarovou mapu"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Jednotka, kterou používat pro tlak."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Stáhnout radarovou mapu při každé aktualizaci."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Jednotka, kterou používat pro teplotu."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Jednotka, kterou používat pro viditelnost."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informace o poloze počasí"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Jednotka, kterou používat pro rychlost větru."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informace o poloze počasí."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval aktualizace"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Aktualizovat data automaticky"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Blízké město"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL radarové mapy"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Používat vlastní URL radarové mapy"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Používat metrické jednotky"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Poloha pásma"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Používat metrické jednotky místo anglosaských."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Poloha radaru"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Předpověď počasí pro město"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informace o poloze počasí"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Město, pro které mateweather zobrazuje informace."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informace o poloze počasí."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Poloha pásma"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Souřadnice polohy"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Zeměpisná šířka a délka vaší polohy vyjádřená jako DD-MM-SS[NS] DD-MM-SS[EW], tj. stupeň-minuta-vteřina[sever-jih], resp. [východ-západ]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Používat vlastní URL radarové mapy"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Je-li \"true\", získat radarovou mapu z polohy určené klíčem \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL radarové mapy"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Používat vlastní URL k získání radarové mapy."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -468,11 +457,6 @@ msgstr "Severozápad"
 msgid "North - Northwest"
 msgstr "Sever - severozápad"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Neplatné"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Jasno"
diff --git a/po/cy.po b/po/cy.po
index 44b0a31..c86cc9f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -12,373 +12,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cy\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Cardiff"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EGFF"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ":RGPMS"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "51-24N 003-21W"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Rhagosodiad"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Annilys"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "metr/eiliad"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/awr"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mya"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "clymau"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Graddfa Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "mph"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "mi"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Amser Cymedrig Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Cod tri-digid er mwyn cyrchu mapiau radar o weather.com, wedi'i ganfod yn http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Cod unigryw ar gyfer y ddinas, fel y gwelir yn http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Diweddaru'r data'n awtomatig"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Penderfynu a ydy'r rhaglennig yn diweddaru ei ystadegau tywydd yn awtomatig ai peidio."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Dangos map radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Uned bellter"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Ysbaid diweddaru"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Cyrchu map radar ar bob diweddariad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Yr ysbaid, mewn eiliadau, rhwng diweddariadau awtomatig."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Os yn wir, yna cyrchu map radar o'r lleoliad a benodwyd gan yr allwedd \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Defnyddio unedau metrig"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Lledred a hydred eich lleoliad, yn y ffurf graddau-munudau-eiliadau (gogledd-de) graddau-munudau-eiliadau (dwyrain-gorllewin)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Defnyddio unedau metrig yn hytrach nag unedau Saesneg."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Cyfesurynnau lleoliad"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Dinas gerllaw"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Uned bellter"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Y brif ardal gyfagos, fel prifddinas, fel y gwelir yn http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ni ddefnyddir bellach"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Uned wasgedd"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Lleoliad radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Uned gyflymder"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Uned dymheredd"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Y ddinas mae mateweather yn dangos gwybodaeth ar ei chyfer."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Y cyfeiriad addasedig i gyrchu'r map radar ohoni."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ni ddefnyddir bellach"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Yr ysbaid, mewn eiliadau, rhwng diweddariadau awtomatig."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Dangos map radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Yr uned i'w ddefnyddio ar gyfer gwasgedd."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Cyrchu map radar ar bob diweddariad."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Yr uned i'w ddefnyddio ar gyfer tymheredd."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Yr uned i'w ddefnyddio ar gyfer gwelededd."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Gwybodaeth lleoliad tywydd"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Yr uned i'w ddefnyddio ar gyfer cyflymder gwynt."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Gwybodaeth lleoliad tywydd."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Ysbaid diweddaru"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Diweddaru'r data'n awtomatig"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Dinas gerllaw"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "LAU ar gyfer y map radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Defnyddio LAU addasedig ar gyfer y map radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Defnyddio unedau metrig"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Lleoliad parth"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Defnyddio unedau metrig yn hytrach nag unedau Saesneg."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Lleoliad radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Tywydd y ddinas"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Gwybodaeth lleoliad tywydd"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Y ddinas mae mateweather yn dangos gwybodaeth ar ei chyfer."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Gwybodaeth lleoliad tywydd."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Lleoliad parth"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Cyfesurynnau lleoliad"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Lledred a hydred eich lleoliad, yn y ffurf graddau-munudau-eiliadau (gogledd-de) graddau-munudau-eiliadau (dwyrain-gorllewin)."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Defnyddio LAU addasedig ar gyfer y map radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Os yn wir, yna cyrchu map radar o'r lleoliad a benodwyd gan yr allwedd \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "LAU ar gyfer y map radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Y cyfeiriad addasedig i gyrchu'r map radar ohoni."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -463,11 +452,6 @@ msgstr "Gogledd Orllewin"
 msgid "North - Northwest"
 msgstr "Gogledd - Gogledd Orllewin"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Annilys"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Awyr Las"
diff --git a/po/da.po b/po/da.po
index dd66656..dec754e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,6 +5,7 @@
 # Translators:
 # Birger Langkjer <[email protected]>, 2000.
 # David Nielsen <[email protected]>, 2006.
+# Joe Hansen <[email protected]>, 2012.
 # Keld Simonsen <[email protected]>, 2000.
 # Kenneth Nielsen <[email protected]>, 2008.
 # Peter Bach <[email protected]>, 2007.
@@ -12,373 +13,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/MATE/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Kastrup"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EKCH"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "55-37N 012-39E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Standard"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ugyldig"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/t"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mpt"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knob"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort-skala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "tmHG"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "En trecifret kode for modtagelse af radarkort fra weather.com, som findes på http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "En unik zone for byen, som findes på http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Opdatér data automatisk"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Om panelprogrammet automatisk opdaterer vejrstatistikken."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Vis radarkort"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Afstandsenhed"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Opdateringsinterval"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hent et radarkort ved hver opdatering."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervallet i sekunder mellem automatiske opdateringer."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Hvis sand, hentes et radarkort fra placeringen angivet ved nøglen \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Benyt metriske mål"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Bredde- og længdegrad for din placering angivet i GG-MM-SS[NS] GG-MM-SS[ØV]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Benyt metriske mål i stedet for Engelske enheder."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinater for sted"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Nærmeste by"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Afstandsenhed"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Bruges ikke mere"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Trykenhed"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarplacering"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Fartenhed"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperaturenhed"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Byen som mateweather viser information om."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Brugerdefineret adresse som radarkort skal hentes fra."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Bruges ikke mere"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervallet i sekunder mellem automatiske opdateringer."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Vis radarkort"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Enheden der skal bruges for tryk."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hent et radarkort ved hver opdatering."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Enheden der skal bruges for temperatur."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Enheden der skal bruges for sigtbarhed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Vejrudsigtsoplysninger"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Enheden der skal bruges for vindhastighed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Vejrudsigtsoplysninger."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Opdateringsinterval"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Opdatér data automatisk"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Nærmeste by"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL for radarkort"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Benyt brugerdefineret adresse til radarkortet"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Benyt metriske mål"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zoneplacering"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Benyt metriske mål i stedet for Engelske enheder."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarplacering"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Vejrudsigt for en by"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Vejrudsigtsoplysninger"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Byen som mateweather viser information om."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Vejrudsigtsoplysninger."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zoneplacering"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinater for sted"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Bredde- og længdegrad for din placering angivet i GG-MM-SS[NS] GG-MM-SS[ØV]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Benyt brugerdefineret adresse til radarkortet"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Hvis sand, hentes et radarkort fra placeringen angivet ved nøglen \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL for radarkort"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Brugerdefineret adresse som radarkort skal hentes fra."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -463,11 +453,6 @@ msgstr "Nordvest"
 msgid "North - Northwest"
 msgstr "Nord-nordvest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ugyldig"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Klar himmel"
diff --git a/po/de.po b/po/de.po
index cb0b0ef..a2f7f1a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,373 +17,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-03-11 13:22+0000\n"
-"Last-Translator: crazyd <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/MATE/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Berlin"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EDDM"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "48-21N 011-47E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Vorgabe"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ungültig"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "Knoten"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort-Skala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mbar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Ein dreistelliger Code zum Abfragen der Radarkarten von weather.com, siehe http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Eine eindeutige Zone für die Stadt, siehe http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Die Daten automatisch aktualisieren"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Legt fest, ob das Applet automatisch seine Wetterstatistiken aktualisiert."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Radarkarte anzeigen"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Abstandseinheit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Aktualisierungsintervall"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Bei jedem Aktualisierungsvorgang eine Radarkarte abrufen."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Das Intervall zwischen automatischen Aktualisierungen in Sekunden."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Falls dieser Schlüssel wahr ist, wird eine Radarkarte von einem Ort abgerufen, der vom Schlüssel »radar« angegeben wird."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Metrische Einheiten verwenden"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "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]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Metrische statt englische Einheiten verwenden"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Standortkoordinaten"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Nächstgelegene Stadt"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Abstandseinheit"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Nächstgelegene bedeutende Region, wie z.B. eine Hauptstadt, gefunden auf http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Nicht mehr verwendet"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Druckeinheit"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarstandort"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Geschwindigkeitseinheit"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatureinheit"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Die Stadt, für die mateweather die Informationen darstellt."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Die Benutzerdefinierte URL, von der die Radarkarte abgerufen werden soll."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Nicht mehr verwendet"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Das Intervall zwischen automatischen Aktualisierungen in Sekunden."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Radarkarte anzeigen"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Die für den Druck zu verwendente Einheit."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Bei jedem Aktualisierungsvorgang eine Radarkarte abrufen."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Die für die Temperatur zu verwendente Einheit."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Die für die Sichtweite zu verwendente Einheit."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informationen zum Wetterstandort."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Die für die Windgeschwindigkeit zu verwendente Einheit."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informationen zum Wetterstandort."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Aktualisierungsintervall"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Die Daten automatisch aktualisieren"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Nächstgelegene Stadt"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL zur Radarkarte"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Benutzerdefinierte URL für die Radarkarte verwenden"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Metrische Einheiten verwenden"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zonen-Standort"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Metrische statt englische Einheiten verwenden"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarstandort"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Wetter für eine Stadt"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informationen zum Wetterstandort."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Die Stadt, für die mateweather die Informationen darstellt."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informationen zum Wetterstandort."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zonen-Standort"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Standortkoordinaten"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "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]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Benutzerdefinierte URL für die Radarkarte verwenden"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Falls dieser Schlüssel wahr ist, wird eine Radarkarte von einem Ort abgerufen, der vom Schlüssel »radar« angegeben wird."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL zur Radarkarte"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Die Benutzerdefinierte URL, von der die Radarkarte abgerufen werden soll."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -468,11 +457,6 @@ msgstr "Nordwest"
 msgid "North - Northwest"
 msgstr "Nord bis Nordwest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ungültig"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Klar"
diff --git a/po/dz.po b/po/dz.po
index 102a257..97ffa99 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,373 +7,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: dz\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "སྔོན་སྒྲིག་གནས་ཁོངས།(_L)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr ",སྔོན་སྒྲིག་ཀོཌི།(_C)"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "སྔོན་སྒྲིག་གླིང་སྡེ།(_Z)"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "སྔོན་སྒྲིག་ར་ཌར།(_R)"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "སྔོན་སྒྲིག་ཆ་སྙོམ།(_C)"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "སྔོན་སྒྲིག"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ནུས་མེད།"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "སྐར་ཆ་རེ་ནང་ མི་ཊར།"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "ཆུ་ཚོད་རེ་ནང་ ཀི་ལོ་མི་ཊར།"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "ཆུ་ཚོད་རེ་ནང་ མ་ཡིལ།"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ནོཊསི།"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "བིའུ་ཕོརཊི་ཆ་ཚད།"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "ཀི་ལོ་པཱསི་ཀཱལ།"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "ཧེཀ་ཊོ་པཱསི་ཀཱལ།"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "མི་ལི་བཱར།"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "མར་ཀུ་རིའི་ མི་ལི་བར། "
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "མར་ཀུ་རིའི་ ཨིན་ཅེསི།"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "བར་སྣང་གི་ཁམས།"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "ཀི་ལོ་མི་ཊར།"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "སྔོན་སྒྲིག་དྲོད་ཚུགས་ཆ་ཕྲན།"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "སྔོན་སྒྲིག་མགྱོགས་ཚད་ཆ་ཕྲན།"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "སྔོན་སྒྲིག་ཨེབ་ཤུགས་ཆ་ཕྲན།"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "སྔོག་སྒྲིག་རྒྱང་ཚད་ཆ་ཕྲན།"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "གནད་སྡུད་རང་བཞིན་གྱིས་ དུས་མཐུན་བཟོ།"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "ཨེཔ་ལེཊི་གིས་ རང་བཞིན་གྱིས་ གནམ་གཤིས་ཚད་རྩིས་ཚུ་ དུས་མཐུན་བཟོ་མི་བཟོ་ ངོས་འཛིན་འབདཝ་ཨིན།"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "ར་ཌར་ས་ཁྲ་ བཀྲམ་སྟོན་འབད།"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "རྒྱང་ཚད་ཆ་ཕྲན།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "བར་མཚམས་དུས་མཐུན་བཟོ།"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "དུས་མཐུན་ཚར་རེ་བཟོཝ་ད་ ར་ཌར་ས་ཁྲ་རེ་ལེན།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "རང་བཞིན་དུས་མཐུན་བཟོ་བའི་ བར་ན་གི་བར་མཚམས་ སྐར་ཆའི་ནང་།"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "བདེན་པ་ཨིན་པ་ཅིན་ \"radar\"ལྡེ་མིག་གིས་ གསལ་བཀོད་འབད་མི་ གནས་ཁོངས་ནང་ལས་ ར་ཌར་ས་ཁྲ་ཅིག་ སླར་འདྲེན་འབད།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "མེ་ཊིཀ་ཆ་ཕྲན་ ལག་ལེན་འཐབ།"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ཨིང་ལིཤ་ཆ་ཕྲན་གྱི་ཚབ་ལུ་ མེ་ཊིཀ་ཆ་ཕྲན་ ལག་ལེན་འཐབ།"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "གནས་ཁོངས་ཀྱི་ཆ་སྙོམ།"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "ཉེ་འདབས་ཀྱི་ཁྲོམ་སྡེ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "རྒྱང་ཚད་ཆ་ཕྲན།"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "ད་རིས་ནངས་པར་ ལག་ལེན་འཐབ་སྲོལ་མེད།"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "ཨེབ་ཤུགས་ཆ་ཕྲན།"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ར་ཌར་གནས་ཁོངས།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "མགྱོགས་ཚད་ཆ་ཕྲན།"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "དྲོད་ཤུགས་ཆ་ཕྲན།"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "ཇི་ཝེ་དར་གྱིས་ བརྡ་དོན་བཀྲམ་སྟོན་འབད་མི་ཁྲོམ་སྡེ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ར་ཌར་ས་ཁྲ་ སླར་འདྲེན་འབད་སའི་ སྲོལ་སྒྲིག་གི་ ཡུ་ཨར་ཨེལ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "ད་རིས་ནངས་པར་ ལག་ལེན་འཐབ་སྲོལ་མེད།"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "རང་བཞིན་དུས་མཐུན་བཟོ་བའི་ བར་ན་གི་བར་མཚམས་ སྐར་ཆའི་ནང་།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "ར་ཌར་ས་ཁྲ་ བཀྲམ་སྟོན་འབད།"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "ཨེབ་ཤུགས་ཀྱི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་ཆ་ཕྲན།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "དུས་མཐུན་ཚར་རེ་བཟོཝ་ད་ ར་ཌར་ས་ཁྲ་རེ་ལེན།"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "དྲོད་ཤུགས་ཀྱི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་ཆ་ཕྲན།"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "མཐོང་གསལ་་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་ཆ་ཕྲན།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "གནམ་གཤིས་གནས་ཁོངས་ཀྱི་བརྡ་དོན་"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "རླུང་མའི་མགྱོགས་ཚད་ཀྱི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་ཆ་ཕྲན།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weather location information."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "བར་མཚམས་དུས་མཐུན་བཟོ།"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "གནད་སྡུད་རང་བཞིན་གྱིས་ དུས་མཐུན་བཟོ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "ཉེ་འདབས་ཀྱི་ཁྲོམ་སྡེ།"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "ར་ཌར་ས་ཁྲའི་དོན་ལུ་ ཡུ་ཨར་ཨེལ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ར་ཌར་ས་ཁྲའི་དོན་ལུ་ སྲོལ་སྒྲིག་གི་ ཡུ་ཨར་ཨེལ་ ལག་ལེན་འཐབ།"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "མེ་ཊིཀ་ཆ་ཕྲན་ ལག་ལེན་འཐབ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "གླིང་སྡེའི་གནས་ཁོངས།"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ཨིང་ལིཤ་ཆ་ཕྲན་གྱི་ཚབ་ལུ་ མེ་ཊིཀ་ཆ་ཕྲན་ ལག་ལེན་འཐབ།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ར་ཌར་གནས་ཁོངས།"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "ཁྲོམ་སྡེ་ཅིག་གནམ་གཤིས།"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "གནམ་གཤིས་གནས་ཁོངས་ཀྱི་བརྡ་དོན་"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "ཇི་ཝེ་དར་གྱིས་ བརྡ་དོན་བཀྲམ་སྟོན་འབད་མི་ཁྲོམ་སྡེ།"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "གླིང་སྡེའི་གནས་ཁོངས།"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "གནས་ཁོངས་ཀྱི་ཆ་སྙོམ།"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ར་ཌར་ས་ཁྲའི་དོན་ལུ་ སྲོལ་སྒྲིག་གི་ ཡུ་ཨར་ཨེལ་ ལག་ལེན་འཐབ།"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "བདེན་པ་ཨིན་པ་ཅིན་ \"radar\"ལྡེ་མིག་གིས་ གསལ་བཀོད་འབད་མི་ གནས་ཁོངས་ནང་ལས་ ར་ཌར་ས་ཁྲ་ཅིག་ སླར་འདྲེན་འབད།"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "ར་ཌར་ས་ཁྲའི་དོན་ལུ་ ཡུ་ཨར་ཨེལ།"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ར་ཌར་ས་ཁྲ་ སླར་འདྲེན་འབད་སའི་ སྲོལ་སྒྲིག་གི་ ཡུ་ཨར་ཨེལ།"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -458,11 +447,6 @@ msgstr "ནུབ་བྱང་།"
 msgid "North - Northwest"
 msgstr "བྱང་-ནུབ་བྱང་།"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "ནུས་མེད།"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "གནམ་དྭངས།"
diff --git a/po/el.po b/po/el.po
index 8aa57ad..97b5af2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Fotis Tsamis <[email protected]>, 2009.
+#   <[email protected]>, 2012.
 # Jennie Petoumenou <[email protected]>, 2009.
 # Kostas Papadimas <[email protected]>,  2002,2003, 2004, 2005, 2006.
 # Nikos Charonitakis <[email protected]>, 2004.
@@ -16,373 +17,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/MATE/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Αθήνα"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LGAV"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "37-56N 023-56E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Προεπιλογή"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Μη έγκυρο"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "κόμβοι"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Κλίμακα Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Μέση ώρα γκρίνουιτς"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Ένας τριψήφιος κωδικός για τη λήψη μετεορολογικών χαρτών από το weather.com. Βρίσκονται στο http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Μια μοναδική ζώνη για την πόλη, όπως εμφανίζεται στο http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Αυτόματη ενημέρωση των δεδομένων"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Καθορίζει αν η μικροεφαρμογή ενημερώνει αυτόματα το καιρό ή όχι."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Προβολή χάρτη ραντάρ"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Μονάδα απόστασης"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Διάστημα ανανέωσης"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Λήψη χάρτη ραντάρ σε κάθε ενημέρωση."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Το διάστημα, σε δευτερόλεπτα, μεταξύ των αυτόματων ενημερώσεων."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Αν αληθές , τότε να γίνει λήψη χάρτη ραντάρ από την τοποθεσία που καθορίζεται από το κλειδί  \"ραντάρ\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Χρήση μετρικού συστήματος"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Γεωγραφικό μήκος και πλάτος της τοποθεσίας σας σε DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Χρήση μετρικού συστήματος αντί για βρετανικές μονάδες."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Συντεταγμένες τοποθεσίας"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Κοντινή πόλη"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Μονάδα απόστασης"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Δεν χρησιμοποιείται πια"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Μονάδα πίεσης"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Τοποθεσία ραντάρ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Μονάδα ταχύτητας"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Μονάδα θερμοκρασίας"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Η πόλη για την οποία το mateweather εμφανίζει πληροφορίες."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Χρήση προσαρμοσμένης διεύθυνσης για λήψη του χάρτη radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Δεν χρησιμοποιείται πια"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Το διάστημα, σε δευτερόλεπτα, μεταξύ των αυτόματων ενημερώσεων."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Προβολή χάρτη ραντάρ"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Η μονάδα μέτρησης πίεσης που θα χρησιμοποιείται."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Λήψη χάρτη ραντάρ σε κάθε ενημέρωση."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Η μονάδα μέτρησης θερμοκρασίας που θα."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Η μονάδα μέτρησης ορατότητας που θα χρησιμοποιείται."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Πληροφορίες τοποθεσίας καιρού"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Η μονάδα μέτρησης ταχύτητας ανέμου που θα χρησιμοποιείται."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Πληροφορίες τοποθεσίας καιρού."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Διάστημα ανανέωσης"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Αυτόματη ενημέρωση των δεδομένων"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Κοντινή πόλη"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Διεύθυνση για το χάρτη ραντάρ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Χρήση προσαρμοσμένης διεύθυνσης για το χάρτη ραντάρ"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Χρήση μετρικού συστήματος"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Τοποθεσία ζώνης"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Χρήση μετρικού συστήματος αντί για βρετανικές μονάδες."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Τοποθεσία ραντάρ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Πρόγνωση καιρού για μια πόλη"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Πληροφορίες τοποθεσίας καιρού"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Η πόλη για την οποία το mateweather εμφανίζει πληροφορίες."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Πληροφορίες τοποθεσίας καιρού."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Τοποθεσία ζώνης"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Συντεταγμένες τοποθεσίας"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Γεωγραφικό μήκος και πλάτος της τοποθεσίας σας σε DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Χρήση προσαρμοσμένης διεύθυνσης για το χάρτη ραντάρ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Αν αληθές , τότε να γίνει λήψη χάρτη ραντάρ από την τοποθεσία που καθορίζεται από το κλειδί  \"ραντάρ\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Διεύθυνση για το χάρτη ραντάρ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Χρήση προσαρμοσμένης διεύθυνσης για λήψη του χάρτη radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -467,11 +457,6 @@ msgstr "Βορειοδυτικός"
 msgid "North - Northwest"
 msgstr "Βόρειος - Βορειοδυτικός"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Μη έγκυρο"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Καθαρός Ουρανός"
diff --git a/po/en_AU.po b/po/en_AU.po
new file mode 100644
index 0000000..1387796
--- /dev/null
+++ b/po/en_AU.po
@@ -0,0 +1,932 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <[email protected]>, 2012.
+# Michael Findlay <[email protected]>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/MATE/language/en_AU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_AU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
+msgid "Default"
+msgstr "Default"
+
+#. translators: Kelvin
+#: ../libmateweather/mateweather-prefs.c:89
+msgid "K"
+msgstr "K"
+
+#. translators: Celsius
+#: ../libmateweather/mateweather-prefs.c:92
+msgid "C"
+msgstr "C"
+
+#. translators: Fahrenheit
+#: ../libmateweather/mateweather-prefs.c:95
+msgid "F"
+msgstr "F"
+
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Invalid"
+
+#. translators: meters per second
+#: ../libmateweather/mateweather-prefs.c:108
+msgid "m/s"
+msgstr "m/s"
+
+#. translators: kilometers per hour
+#: ../libmateweather/mateweather-prefs.c:111
+msgid "km/h"
+msgstr "km/h"
+
+#. translators: miles per hour
+#: ../libmateweather/mateweather-prefs.c:114
+msgid "mph"
+msgstr "mph"
+
+#. translators: knots (speed unit)
+#: ../libmateweather/mateweather-prefs.c:117
+msgid "knots"
+msgstr "knots"
+
+#. translators: wind speed
+#: ../libmateweather/mateweather-prefs.c:120
+msgid "Beaufort scale"
+msgstr "Beaufort scale"
+
+#. translators: kilopascals
+#: ../libmateweather/mateweather-prefs.c:133
+msgid "kPa"
+msgstr "kPa"
+
+#. translators: hectopascals
+#: ../libmateweather/mateweather-prefs.c:136
+msgid "hPa"
+msgstr "hPa"
+
+#. translators: millibars
+#: ../libmateweather/mateweather-prefs.c:139
+msgid "mb"
+msgstr "mb"
+
+#. translators: millimeters of mercury
+#: ../libmateweather/mateweather-prefs.c:142
+msgid "mmHg"
+msgstr "mmHg"
+
+#. translators: inches of mercury
+#: ../libmateweather/mateweather-prefs.c:145
+msgid "inHg"
+msgstr "inHg"
+
+#. translators: atmosphere
+#: ../libmateweather/mateweather-prefs.c:148
+msgid "atm"
+msgstr "atm"
+
+#. translators: meters
+#: ../libmateweather/mateweather-prefs.c:161
+msgid "m"
+msgstr "m"
+
+#. translators: kilometers
+#: ../libmateweather/mateweather-prefs.c:164
+msgid "km"
+msgstr "km"
+
+#. translators: miles
+#: ../libmateweather/mateweather-prefs.c:167
+msgid "mi"
+msgstr "mi"
+
+#: ../libmateweather/mateweather-timezone.c:314
+msgid "Greenwich Mean Time"
+msgstr "Greenwich Mean Time"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Update the data automatically"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
+msgstr "Determines whether the applet automatically updates its weather statistics or not."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Update interval"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "The interval, in seconds, between automatic updates."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Use metric units"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Use metric units instead of english units."
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distance unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
+
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "Pressure unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "Speed unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Temperature unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Not used anymore"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Display radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Fetch a radar map on each update."
+
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Weather location information"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weather location information."
+
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Nearby city"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zone location"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar location"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Weather for a city"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "The city that mateweather displays information for."
+
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Location coordinates"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Use custom url for the radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url for the radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "The custom url from where to retrieve a radar map."
+
+#: ../libmateweather/timezone-menu.c:277
+msgctxt "timezone"
+msgid "Unknown"
+msgstr "Unknown"
+
+#. Translators: %d is an error code, and %s the error string
+#: ../libmateweather/weather-metar.c:504
+#, c-format
+msgid "Failed to get METAR data: %d %s.\n"
+msgstr "Failed to get METAR data: %d %s.\n"
+
+#: ../libmateweather/weather-metar.c:548
+msgid "WeatherInfo missing location"
+msgstr "WeatherInfo missing location"
+
+#: ../libmateweather/weather.c:232
+msgid "Variable"
+msgstr "Variable"
+
+#: ../libmateweather/weather.c:233
+msgid "North"
+msgstr "North"
+
+#: ../libmateweather/weather.c:233
+msgid "North - NorthEast"
+msgstr "North - NorthEast"
+
+#: ../libmateweather/weather.c:233
+msgid "Northeast"
+msgstr "Northeast"
+
+#: ../libmateweather/weather.c:233
+msgid "East - NorthEast"
+msgstr "East - NorthEast"
+
+#: ../libmateweather/weather.c:234
+msgid "East"
+msgstr "East"
+
+#: ../libmateweather/weather.c:234
+msgid "East - Southeast"
+msgstr "East - Southeast"
+
+#: ../libmateweather/weather.c:234
+msgid "Southeast"
+msgstr "Southeast"
+
+#: ../libmateweather/weather.c:234
+msgid "South - Southeast"
+msgstr "South - Southeast"
+
+#: ../libmateweather/weather.c:235
+msgid "South"
+msgstr "South"
+
+#: ../libmateweather/weather.c:235
+msgid "South - Southwest"
+msgstr "South - Southwest"
+
+#: ../libmateweather/weather.c:235
+msgid "Southwest"
+msgstr "Southwest"
+
+#: ../libmateweather/weather.c:235
+msgid "West - Southwest"
+msgstr "West - Southwest"
+
+#: ../libmateweather/weather.c:236
+msgid "West"
+msgstr "West"
+
+#: ../libmateweather/weather.c:236
+msgid "West - Northwest"
+msgstr "West - Northwest"
+
+#: ../libmateweather/weather.c:236
+msgid "Northwest"
+msgstr "Northwest"
+
+#: ../libmateweather/weather.c:236
+msgid "North - Northwest"
+msgstr "North - Northwest"
+
+#: ../libmateweather/weather.c:249
+msgid "Clear Sky"
+msgstr "Clear Sky"
+
+#: ../libmateweather/weather.c:250
+msgid "Broken clouds"
+msgstr "Broken clouds"
+
+#: ../libmateweather/weather.c:251
+msgid "Scattered clouds"
+msgstr "Scattered clouds"
+
+#: ../libmateweather/weather.c:252
+msgid "Few clouds"
+msgstr "Few clouds"
+
+#: ../libmateweather/weather.c:253
+msgid "Overcast"
+msgstr "Overcast"
+
+#. TRANSLATOR: If you want to know what "blowing" "shallow" "partial"
+#. * etc means, you can go to http://www.weather.com/glossary/ and
+#. * http://www.crh.noaa.gov/arx/wx.tbl.php
+#. NONE
+#: ../libmateweather/weather.c:292 ../libmateweather/weather.c:294
+msgid "Thunderstorm"
+msgstr "Thunderstorm"
+
+#. DRIZZLE
+#: ../libmateweather/weather.c:293
+msgid "Drizzle"
+msgstr "Drizzle"
+
+#: ../libmateweather/weather.c:293
+msgid "Light drizzle"
+msgstr "Light drizzle"
+
+#: ../libmateweather/weather.c:293
+msgid "Moderate drizzle"
+msgstr "Moderate drizzle"
+
+#: ../libmateweather/weather.c:293
+msgid "Heavy drizzle"
+msgstr "Heavy drizzle"
+
+#: ../libmateweather/weather.c:293
+msgid "Freezing drizzle"
+msgstr "Freezing drizzle"
+
+#. RAIN
+#: ../libmateweather/weather.c:294
+msgid "Rain"
+msgstr "Rain"
+
+#: ../libmateweather/weather.c:294
+msgid "Light rain"
+msgstr "Light rain"
+
+#: ../libmateweather/weather.c:294
+msgid "Moderate rain"
+msgstr "Moderate rain"
+
+#: ../libmateweather/weather.c:294
+msgid "Heavy rain"
+msgstr "Heavy rain"
+
+#: ../libmateweather/weather.c:294
+msgid "Rain showers"
+msgstr "Rain showers"
+
+#: ../libmateweather/weather.c:294
+msgid "Freezing rain"
+msgstr "Freezing rain"
+
+#. SNOW
+#: ../libmateweather/weather.c:295
+msgid "Snow"
+msgstr "Snow"
+
+#: ../libmateweather/weather.c:295
+msgid "Light snow"
+msgstr "Light snow"
+
+#: ../libmateweather/weather.c:295
+msgid "Moderate snow"
+msgstr "Moderate snow"
+
+#: ../libmateweather/weather.c:295
+msgid "Heavy snow"
+msgstr "Heavy snow"
+
+#: ../libmateweather/weather.c:295
+msgid "Snowstorm"
+msgstr "Snowstorm"
+
+#: ../libmateweather/weather.c:295
+msgid "Blowing snowfall"
+msgstr "Blowing snowfall"
+
+#: ../libmateweather/weather.c:295
+msgid "Snow showers"
+msgstr "Snow showers"
+
+#: ../libmateweather/weather.c:295
+msgid "Drifting snow"
+msgstr "Drifting snow"
+
+#. SNOW_GRAINS
+#: ../libmateweather/weather.c:296
+msgid "Snow grains"
+msgstr "Snow grains"
+
+#: ../libmateweather/weather.c:296
+msgid "Light snow grains"
+msgstr "Light snow grains"
+
+#: ../libmateweather/weather.c:296
+msgid "Moderate snow grains"
+msgstr "Moderate snow grains"
+
+#: ../libmateweather/weather.c:296
+msgid "Heavy snow grains"
+msgstr "Heavy snow grains"
+
+#. ICE_CRYSTALS
+#: ../libmateweather/weather.c:297
+msgid "Ice crystals"
+msgstr "Ice crystals"
+
+#. ICE_PELLETS
+#: ../libmateweather/weather.c:298
+msgid "Ice pellets"
+msgstr "Ice pellets"
+
+#: ../libmateweather/weather.c:298
+msgid "Few ice pellets"
+msgstr "Few ice pellets"
+
+#: ../libmateweather/weather.c:298
+msgid "Moderate ice pellets"
+msgstr "Moderate ice pellets"
+
+#: ../libmateweather/weather.c:298
+msgid "Heavy ice pellets"
+msgstr "Heavy ice pellets"
+
+#: ../libmateweather/weather.c:298
+msgid "Ice pellet storm"
+msgstr "Ice pellet storm"
+
+#: ../libmateweather/weather.c:298
+msgid "Showers of ice pellets"
+msgstr "Showers of ice pellets"
+
+#. HAIL
+#: ../libmateweather/weather.c:299
+msgid "Hail"
+msgstr "Hail"
+
+#: ../libmateweather/weather.c:299
+msgid "Hailstorm"
+msgstr "Hailstorm"
+
+#: ../libmateweather/weather.c:299
+msgid "Hail showers"
+msgstr "Hail showers"
+
+#. SMALL_HAIL
+#: ../libmateweather/weather.c:300
+msgid "Small hail"
+msgstr "Small hail"
+
+#: ../libmateweather/weather.c:300
+msgid "Small hailstorm"
+msgstr "Small hailstorm"
+
+#: ../libmateweather/weather.c:300
+msgid "Showers of small hail"
+msgstr "Showers of small hail"
+
+#. PRECIPITATION
+#: ../libmateweather/weather.c:301
+msgid "Unknown precipitation"
+msgstr "Unknown precipitation"
+
+#. MIST
+#: ../libmateweather/weather.c:302
+msgid "Mist"
+msgstr "Mist"
+
+#. FOG
+#: ../libmateweather/weather.c:303
+msgid "Fog"
+msgstr "Fog"
+
+#: ../libmateweather/weather.c:303
+msgid "Fog in the vicinity"
+msgstr "Fog in the vicinity"
+
+#: ../libmateweather/weather.c:303
+msgid "Shallow fog"
+msgstr "Shallow fog"
+
+#: ../libmateweather/weather.c:303
+msgid "Patches of fog"
+msgstr "Patches of fog"
+
+#: ../libmateweather/weather.c:303
+msgid "Partial fog"
+msgstr "Partial fog"
+
+#: ../libmateweather/weather.c:303
+msgid "Freezing fog"
+msgstr "Freezing fog"
+
+#. SMOKE
+#: ../libmateweather/weather.c:304
+msgid "Smoke"
+msgstr "Smoke"
+
+#. VOLCANIC_ASH
+#: ../libmateweather/weather.c:305
+msgid "Volcanic ash"
+msgstr "Volcanic ash"
+
+#. SAND
+#: ../libmateweather/weather.c:306
+msgid "Sand"
+msgstr "Sand"
+
+#: ../libmateweather/weather.c:306
+msgid "Blowing sand"
+msgstr "Blowing sand"
+
+#: ../libmateweather/weather.c:306
+msgid "Drifting sand"
+msgstr "Drifting sand"
+
+#. HAZE
+#: ../libmateweather/weather.c:307
+msgid "Haze"
+msgstr "Haze"
+
+#. SPRAY
+#: ../libmateweather/weather.c:308
+msgid "Blowing sprays"
+msgstr "Blowing sprays"
+
+#. DUST
+#: ../libmateweather/weather.c:309
+msgid "Dust"
+msgstr "Dust"
+
+#: ../libmateweather/weather.c:309
+msgid "Blowing dust"
+msgstr "Blowing dust"
+
+#: ../libmateweather/weather.c:309
+msgid "Drifting dust"
+msgstr "Drifting dust"
+
+#. SQUALL
+#: ../libmateweather/weather.c:310
+msgid "Squall"
+msgstr "Squall"
+
+#. SANDSTORM
+#: ../libmateweather/weather.c:311
+msgid "Sandstorm"
+msgstr "Sandstorm"
+
+#: ../libmateweather/weather.c:311
+msgid "Sandstorm in the vicinity"
+msgstr "Sandstorm in the vicinity"
+
+#: ../libmateweather/weather.c:311
+msgid "Heavy sandstorm"
+msgstr "Heavy sandstorm"
+
+#. DUSTSTORM
+#: ../libmateweather/weather.c:312
+msgid "Duststorm"
+msgstr "Duststorm"
+
+#: ../libmateweather/weather.c:312
+msgid "Duststorm in the vicinity"
+msgstr "Duststorm in the vicinity"
+
+#: ../libmateweather/weather.c:312
+msgid "Heavy duststorm"
+msgstr "Heavy duststorm"
+
+#. FUNNEL_CLOUD
+#: ../libmateweather/weather.c:313
+msgid "Funnel cloud"
+msgstr "Funnel cloud"
+
+#. TORNADO
+#: ../libmateweather/weather.c:314
+msgid "Tornado"
+msgstr "Tornado"
+
+#. DUST_WHIRLS
+#: ../libmateweather/weather.c:315
+msgid "Dust whirls"
+msgstr "Dust whirls"
+
+#: ../libmateweather/weather.c:315
+msgid "Dust whirls in the vicinity"
+msgstr "Dust whirls in the vicinity"
+
+#. TRANSLATOR: this is a format string for strftime
+#. *             see `man 3 strftime` for more details
+#. 
+#: ../libmateweather/weather.c:710
+msgid "%a, %b %d / %H:%M"
+msgstr "%a, %b %d / %H:%M"
+
+#: ../libmateweather/weather.c:725
+msgid "Unknown observation time"
+msgstr "Unknown observation time"
+
+#: ../libmateweather/weather.c:739 ../libmateweather/weather.c:790
+#: ../libmateweather/weather.c:804 ../libmateweather/weather.c:817
+#: ../libmateweather/weather.c:830 ../libmateweather/weather.c:843
+#: ../libmateweather/weather.c:861 ../libmateweather/weather.c:879
+#: ../libmateweather/weather.c:917 ../libmateweather/weather.c:933
+#: ../libmateweather/weather.c:956 ../libmateweather/weather.c:988
+#: ../libmateweather/weather.c:1004 ../libmateweather/weather.c:1024
+msgid "Unknown"
+msgstr "Unknown"
+
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
+#. U+00B0 DEGREE SIGN)
+#: ../libmateweather/weather.c:761
+#, c-format
+msgid "%.1f °F"
+msgstr "%.1f °F"
+
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
+#. U+00B0 DEGREE SIGN)
+#: ../libmateweather/weather.c:764
+#, c-format
+msgid "%d °F"
+msgstr "%d °F"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
+#. DEGREE SIGN)
+#: ../libmateweather/weather.c:770
+#, c-format
+msgid "%.1f °C"
+msgstr "%.1f °C"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
+#. DEGREE SIGN)
+#: ../libmateweather/weather.c:773
+#, c-format
+msgid "%d °C"
+msgstr "%d °C"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../libmateweather/weather.c:779
+#, c-format
+msgid "%.1f K"
+msgstr "%.1f K"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../libmateweather/weather.c:782
+#, c-format
+msgid "%d K"
+msgstr "%d K"
+
+#. TRANSLATOR: This is the humidity in percent
+#: ../libmateweather/weather.c:864
+#, c-format
+msgid "%.f%%"
+msgstr "%.f%%"
+
+#. TRANSLATOR: This is the wind speed in knots
+#: ../libmateweather/weather.c:892
+#, c-format
+msgid "%0.1f knots"
+msgstr "%0.1f knots"
+
+#. TRANSLATOR: This is the wind speed in miles per hour
+#: ../libmateweather/weather.c:896
+#, c-format
+msgid "%.1f mph"
+msgstr "%.1f mph"
+
+#. TRANSLATOR: This is the wind speed in kilometers per hour
+#: ../libmateweather/weather.c:900
+#, c-format
+msgid "%.1f km/h"
+msgstr "%.1f km/h"
+
+#. TRANSLATOR: This is the wind speed in meters per second
+#: ../libmateweather/weather.c:904
+#, c-format
+msgid "%.1f m/s"
+msgstr "%.1f m/s"
+
+#. TRANSLATOR: This is the wind speed as a Beaufort force factor
+#. * (commonly used in nautical wind estimation).
+#. 
+#: ../libmateweather/weather.c:910
+#, c-format
+msgid "Beaufort force %.1f"
+msgstr "Beaufort force %.1f"
+
+#: ../libmateweather/weather.c:935
+msgid "Calm"
+msgstr "Calm"
+
+#. TRANSLATOR: This is 'wind direction' / 'wind speed'
+#: ../libmateweather/weather.c:939
+#, c-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
+#. TRANSLATOR: This is pressure in inches of mercury
+#: ../libmateweather/weather.c:961
+#, c-format
+msgid "%.2f inHg"
+msgstr "%.2f inHg"
+
+#. TRANSLATOR: This is pressure in millimeters of mercury
+#: ../libmateweather/weather.c:965
+#, c-format
+msgid "%.1f mmHg"
+msgstr "%.1f mmHg"
+
+#. TRANSLATOR: This is pressure in kiloPascals
+#: ../libmateweather/weather.c:969
+#, c-format
+msgid "%.2f kPa"
+msgstr "%.2f kPa"
+
+#. TRANSLATOR: This is pressure in hectoPascals
+#: ../libmateweather/weather.c:973
+#, c-format
+msgid "%.2f hPa"
+msgstr "%.2f hPa"
+
+#. TRANSLATOR: This is pressure in millibars
+#: ../libmateweather/weather.c:977
+#, c-format
+msgid "%.2f mb"
+msgstr "%.2f mb"
+
+#. TRANSLATOR: This is pressure in atmospheres
+#: ../libmateweather/weather.c:981
+#, c-format
+msgid "%.3f atm"
+msgstr "%.3f atm"
+
+#. TRANSLATOR: This is the visibility in miles
+#: ../libmateweather/weather.c:1009
+#, c-format
+msgid "%.1f miles"
+msgstr "%.1f miles"
+
+#. TRANSLATOR: This is the visibility in kilometers
+#: ../libmateweather/weather.c:1013
+#, c-format
+msgid "%.1f km"
+msgstr "%.1f km"
+
+#. TRANSLATOR: This is the visibility in meters
+#: ../libmateweather/weather.c:1017
+#, c-format
+msgid "%.0fm"
+msgstr "%.0fm"
+
+#: ../libmateweather/weather.c:1046 ../libmateweather/weather.c:1067
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: ../libmateweather/weather.c:1126
+msgid "Retrieval failed"
+msgstr "Retrieval failed"
diff --git a/po/en_CA.po b/po/en_CA.po
index ee4b657..e6127a6 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_CA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Ottawa"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "CYOW"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "-----"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "tyx"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "45-19N 075-40W"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Default"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Invalid"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
+#: ../libmateweather/mateweather-timezone.c:314
+msgid "Greenwich Mean Time"
+msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Update the data automatically"
 
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "kPa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
+msgstr "Determines whether the applet automatically updates its weather statistics or not."
 
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Update interval"
 
-#: ../libmateweather/mateweather-timezone.c:314
-msgid "Greenwich Mean Time"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "The interval, in seconds, between automatic updates."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Use metric units"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Use metric units instead of English units."
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distance unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
+
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "Pressure unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:2
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "Speed unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Temperature unit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Determines whether the applet automatically updates its weather statistics "
-"or not."
-msgstr "Determines whether the applet automatically updates its weather statistics or not."
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Not used anymore"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
 msgid "Display radar map"
 msgstr "Display radar map"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Distance unit"
-
-#: ../libmateweather/mateweather.schemas.in.h:11
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
 msgid "Fetch a radar map on each update."
 msgstr "Fetch a radar map on each update."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Weather location information"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Location coordinates"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weather location information."
 
-#: ../libmateweather/mateweather.schemas.in.h:15
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
 msgid "Nearby city"
 msgstr "Nearby city"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
 msgid ""
 "Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Not used anymore"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr "Pressure unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zone location"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:19
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
 msgid "Radar location"
 msgstr "Radar location"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
-msgstr "Speed unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr "Temperature unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Weather for a city"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
 msgid "The city that mateweather displays information for."
 msgstr "The city that mateweather displays information for."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "The custom url from where to retrieve a radar map."
-
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "The interval, in seconds, between automatic updates."
-
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "The units to use for pressure."
-
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "The units to use for temperature."
-
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "The units to use for visibility."
-
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "The units to use for wind speed."
-
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Update interval"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Location coordinates"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
 
-#: ../libmateweather/mateweather.schemas.in.h:32
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
 msgid "Use custom url for the radar map"
 msgstr "Use custom URL for the radar map"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Use metric units"
-
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Use metric units instead of English units."
-
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Weather for a city"
-
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL for the radar map"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "The custom url from where to retrieve a radar map."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "NorthWest"
 msgid "North - Northwest"
 msgstr "North - NorthWest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Invalid"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Clear Sky"
diff --git a/po/en_GB.po b/po/en_GB.po
index ef13155..d8cc4fc 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "London/Heathrow"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EGLL"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ":RBPMS"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Default"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Invalid"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "mph"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "mi"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A three-digit-long code for retrieving radar maps from weather.com, found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A unique zone for the city, as found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Update the data automatically"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determines whether the applet automatically updates its weather statistics."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Display radar map"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Distance unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Update interval"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "The interval, in seconds, between automatic updates."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Use metric units"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Use metric units instead of Imperial units."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Location co-ordinates"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distance unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Not used anymore"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Pressure unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Speed unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperature unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "The custom URI from which to retrieve a radar map."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Not used anymore"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Display radar map"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Fetch a radar map on each update."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "The unit to use for temperature."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Weather location information"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "The unit to use for wind speed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weather location information."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Update interval"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Nearby city"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URI for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Use custom URI for the radar map"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zone location"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Use metric units instead of Imperial units."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar location"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Weather for a city"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "The city that mateweather displays information for."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Location co-ordinates"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Use custom URI for the radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URI for the radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "The custom URI from which to retrieve a radar map."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "Northwest"
 msgid "North - Northwest"
 msgstr "North - Northwest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Invalid"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Clear Sky"
diff --git a/po/eo.po b/po/eo.po
index bd450da..914d0bb 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3,379 +3,369 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <[email protected]>, 2012.
 # Hendrik LÖNNGREN, 2009.
 # Kristjan SCHMIDT <[email protected]>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/MATE/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Defaŭlto"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nevalida"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mejloj/h"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nodoj"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Boforta skalo"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mbar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "coloj Hg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mejloj"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Meza Tempo de Grenviĉo"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Aŭtomate ĝisdatigi la datumojn"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Difinas ĉu la aplikaĵeto aŭtomate ĝisdatigas siajn veterstatistikojn aŭ ne."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Montri radaran mapon"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Distanca unuo"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Ĝisdatiga intervalo"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Venigi radaran mapon je ĉiu ĝisdatigo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "La intervalo, en sekundoj, inter aŭtomataj ĝisdatigoj."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Se vera, tiam akiru radaran mapon de loko specifita per la \"radara\" ŝlosilo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Uzi metrikajn unuojn"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitudo kaj longitudo de via pozicio esprimataj per GG-MM-SS[NS] GG-MM-SS[OrOk]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Uzi metrikajn unuojn anstataŭ anglajn unuojn."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Lokaj koordinatoj"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Proksima urbo"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distanca unuo"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ne plu uzata"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Aerprema unuo"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarpozicio"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Rapideca unuo"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatura unuo"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La urbo pri kiu mateweather montras informojn."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La propra URL de kie la radara mapo estas eltirenda."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ne plu uzata"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "La intervalo, en sekundoj, inter aŭtomataj ĝisdatigoj."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Montri radaran mapon"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unuo uzenda por aerpremo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Venigi radaran mapon je ĉiu ĝisdatigo."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unuo uzenda por temperaturo."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unuo uzenda por videblo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Vetera pozicia informo"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unuo uzenda por ventrapideco."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Vetera pozicia informo."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Ĝisdatiga intervalo"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Aŭtomate ĝisdatigi la datumojn"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Proksima urbo"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL por la radara mapo"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Uzi propran URL-n por la radara mapo"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Uzi metrikajn unuojn"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zona pozicio"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Uzi metrikajn unuojn anstataŭ anglajn unuojn."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarpozicio"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Vetero por urbo"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Vetera pozicia informo"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La urbo pri kiu mateweather montras informojn."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Vetera pozicia informo."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zona pozicio"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Lokaj koordinatoj"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitudo kaj longitudo de via pozicio esprimataj per GG-MM-SS[NS] GG-MM-SS[OrOk]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Uzi propran URL-n por la radara mapo"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Se vera, tiam akiru radaran mapon de loko specifita per la \"radara\" ŝlosilo."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL por la radara mapo"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La propra URL de kie la radara mapo estas eltirenda."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +450,6 @@ msgstr "Nordokcidenta"
 msgid "North - Northwest"
 msgstr "Norda - Nordokcidenta"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nevalida"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Klara ĉielo"
diff --git a/po/es.po b/po/es.po
index c8a174a..d076137 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-15 10:38+0000\n"
-"Last-Translator: Lluís Tusquellas <[email protected]>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.com/projects/p/MATE/language/es/)\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/MATE/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Madrid (Barajas)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LEMD"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "LEMD"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Hora media de Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un código de tres dígitos para obtener los mapas de radar desde weather.com, tal como los que se encuentran en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Una zona única para la ciudad, tal como se encuentra en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Zona principal cercana, como la ciudad capital, según se encuentra en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_AR.po b/po/es_AR.po
index f3341cf..6f256ed 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_AR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Buenos Aires"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SABA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "34-35S 058-29O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_CL.po b/po/es_CL.po
index fc6eff1..39f00c2 100644
--- a/po/es_CL.po
+++ b/po/es_CL.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-06-03 08:41+0000\n"
-"Last-Translator: Pablo Lezaeta <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/MATE/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CL\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Santiago"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "MPSA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "08-05N 080-57O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Tiempo del meridiano de Greenwitch"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un codigo de tres dígitos de largo para resivir los mapas desde el radar de weather.com, encontrados en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Una única zona para la ciudad, encontrada en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Cercana a una zona mayor, tal como una capital, encontrada en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xm.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_CO.po b/po/es_CO.po
index d78d05b..6c9cfaa 100644
--- a/po/es_CO.po
+++ b/po/es_CO.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Bogotá (El Dorado)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SKBO"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "04-43N 074-09O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_CR.po b/po/es_CR.po
index 56d800f..014c429 100644
--- a/po/es_CR.po
+++ b/po/es_CR.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "San José"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_DO.po b/po/es_DO.po
index 0ab631a..ab8debe 100644
--- a/po/es_DO.po
+++ b/po/es_DO.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_DO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Santo Domingo"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_EC.po b/po/es_EC.po
index 37b8c43..6cfc39f 100644
--- a/po/es_EC.po
+++ b/po/es_EC.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_EC\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Quito (Mariscal Sucre)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SEQU"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "00-09S 078-29O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_ES.po b/po/es_ES.po
index 57d8e1e..a7c33dc 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Madrid (Barajas)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LEMD"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "LEMD"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_MX.po b/po/es_MX.po
index c7b8773..1b979c9 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_MX\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Ciudad de México"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "MMMX"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "19-26N 099-06O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_NI.po b/po/es_NI.po
index 182616e..f1b7f7d 100644
--- a/po/es_NI.po
+++ b/po/es_NI.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:13+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_NI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Managua"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "MNMG"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "12-09N 086-10O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_PA.po b/po/es_PA.po
index 0604f85..d523cd4 100644
--- a/po/es_PA.po
+++ b/po/es_PA.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_PA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Asunción"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SGAS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "25-16S 057-38O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_PE.po b/po/es_PE.po
index 1893b7a..db21cfa 100644
--- a/po/es_PE.po
+++ b/po/es_PE.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_PE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Lima Callao (Jorge Chávez)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SPIM"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "12-00S 077-07O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_PR.po b/po/es_PR.po
index ffb469a..cd3c69d 100644
--- a/po/es_PR.po
+++ b/po/es_PR.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_PR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Ciudad de Panamá"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "KPFN"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "FLZ012"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "tlh"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "30-12-27N 085-41-06O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_SV.po b/po/es_SV.po
index ba7a17b..ae02014 100644
--- a/po/es_SV.po
+++ b/po/es_SV.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_SV\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "San Salvador (Ilopango)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "MSSS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "13-42N 089-07O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_UY.po b/po/es_UY.po
index 166809e..02c679f 100644
--- a/po/es_UY.po
+++ b/po/es_UY.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_UY\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Montevideo (Carrasco)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SUMU"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "34-50S 056-00O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/es_VE.po b/po/es_VE.po
index 407556f..2c7b195 100644
--- a/po/es_VE.po
+++ b/po/es_VE.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Caracas Maiquetia Aerop. Intl. Simón Bolívar"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SVMI"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "10-36N 066-59O"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predeterminado"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nudos"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar los datos automáticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina si la miniaplicación actualiza automáticamente sus estadísticas meteorológicas o no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar el mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidad de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obtener un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "El intervalo en segundos entre las actualizaciones automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usa unidades métricas en vez de las unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas de la zona"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ciudad cercana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidad de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ya no se utiliza"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidad de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Zona de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidad de velocidad"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidad de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciudad para la que mateweather muestra información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "La url personalizada desde donde recuperar un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ya no se utiliza"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "El intervalo en segundos entre las actualizaciones automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar el mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "La unidad en la que medir la presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obtener un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "La unidad en la que medir la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "La unidad en que medir la visibilidad."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorológica de una zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "La unidad en que medir la velocidad del viento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorológica de una zona."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar los datos automáticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ciudad cercana"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para el mapa del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usa una url personalizada para el mapa del radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Situación de la zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usa unidades métricas en vez de las unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Zona de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Meteorología para una ciudad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorológica de una zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciudad para la que mateweather muestra información."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorológica de una zona."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Situación de la zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas de la zona"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud y longitud de su zona expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usa una url personalizada para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si es «true» (verdadero), entonces recupera un mapa de radar desde la dirección especificada por la clave «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url para el mapa del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "La url personalizada desde donde recuperar un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo despejado"
diff --git a/po/et.po b/po/et.po
index 257a20f..3b007a3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,373 +11,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-03-13 12:00+0000\n"
-"Last-Translator: xpander0 <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/MATE/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Tallinn"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EETN"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "Europe/Tallinn"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "\" \""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "59-24N 024-49E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Vaikimisi"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Vigane"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/t"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "miili tunnis"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "sõlme"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "palli"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mbar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mm Hg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "tolli Hg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "miili"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwichi ajavöönd"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Kolmekohaline number radarikaardi vastuvõtmiseks weather.com saidist. Numbrid leiab aadressilt http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Unikaalne piirkond linna jaoks, nagu on näidatud aadressil http://git.mate.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Andmete automaatne uuendamine"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Selle abil määratakse, kas rakend uuendab ilmastatistikat automaatselt või mitte."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Näita _radarikaarti"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Kaugusühik"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Uuendamise intervall:"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Radarikaardi hankimine iga uuenduse korral."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Vahemik sekundites automaatsete uuenduste vahel."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Kui märgitud, siis võetakse radarikaart \"radar\" võtmega määratud asukohast."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Kasuta meetermõõdustikku"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Sinu asukoha laius- ja pikkuskraad väljendatuna DD-MM-SS[NS] DD-MM-SS[EW] vormingus"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Kasuta meetermõõdustikku inglise mõõdustiku asemel"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Asukoha koordinaadid"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Lähim linn"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Kaugusühik"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Lähedal asuv suurem piirkond, nagu näiteks linn, mis on leitav aadressilt http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Enam ei kasutata"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Rõhuühik"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radari asukoht"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Kiirusühik"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatuuriühik"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Linn, mille kohta mateweather andmeid kuvab."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Kohandatud url radarikaardi hankimiseks."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Enam ei kasutata"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Vahemik sekundites automaatsete uuenduste vahel."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Näita _radarikaarti"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Rõhuühik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Radarikaardi hankimine iga uuenduse korral."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Temperatuuriühik."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Nähavusühik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Ilmaasukoha andmed"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Tuulekiiruse ühik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Ilmaasukoha andmed."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Uuendamise intervall:"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Andmete automaatne uuendamine"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Lähim linn"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Radarikaardi url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Kasuta radarikaardi jaoks oma aadressi"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Kasuta meetermõõdustikku"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Tsooni asukoht"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Kasuta meetermõõdustikku inglise mõõdustiku asemel"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radari asukoht"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Ilm linna jaoks"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Ilmaasukoha andmed"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Linn, mille kohta mateweather andmeid kuvab."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Ilmaasukoha andmed."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Tsooni asukoht"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Asukoha koordinaadid"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Sinu asukoha laius- ja pikkuskraad väljendatuna DD-MM-SS[NS] DD-MM-SS[EW] vormingus"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Kasuta radarikaardi jaoks oma aadressi"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Kui märgitud, siis võetakse radarikaart \"radar\" võtmega määratud asukohast."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Radarikaardi url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Kohandatud url radarikaardi hankimiseks."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -462,11 +451,6 @@ msgstr "Loodest"
 msgid "North - Northwest"
 msgstr "Põhjast - loodest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Vigane"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Selge taevas"
diff --git a/po/eu.po b/po/eu.po
index b1a3f0e..1a5519e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Asier Iturralde Sarasola <[email protected]>, 2013.
 # Hizkuntza Politikarako Sailburuordetza <[email protected]>, 2004, 2005.
 # Iñaki Larrañaga Murgoitio <[email protected]>, 2004, 2006, 2007, 2008, 2009, 2010.
 # Iñaki Larrañaga Murgoitio <[email protected]>, 2007.
@@ -10,373 +11,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-16 15:09+0000\n"
+"Last-Translator: Asier Iturralde Sarasola <[email protected]>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/MATE/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Donostia"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LESO"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "43-21N 001-48W"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Lehenetsia"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Baliogabea"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/o"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "m/o"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "korapilo"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort eskala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Meridianoko Ordua"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Hiru digitu luzerako kodea radar-mapak eskuratzeko weather.com gunetik, honako fitxategian aurkitzen den bezala: http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Hiriarentzako zona bakarra, honako fitxategian aurkitzen den bezala: http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Eguneratu datuak automatikoki"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Applet-ak eguraldiaren estatistikak automatikoki eguneratuko dituen ala ez zehazten du."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Erakutsi radar-mapa"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Distantzia-unitateak"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Eguneratze-maiztasuna"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hartu radar-mapa bat eguneratze bakoitzean."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Eguneratze automatikoak egiteko denbora-bitartea (segundotan)."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Egiazkoa bada, radar-mapa bat eskuratuko du \"radarra\" gakoan zehaztutako lekutik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Erabili sistema metrikoa"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Kokalekuaren latitudea eta longitudea honako moduan adieraziz: DD-MM-SS[NS] DD-MM-SS[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Erabili sistema metrikoa unitate ingelesen ordez."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Kokalekuaren koordenatuak"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Gertuko hiria"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distantzia-unitateak"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Orain ez da erabiltzen"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Presio-unitateak:"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radar kokalekua"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'km/h'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Abiadura-unitateak"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "Haizearen abiadurarentzat erabili beharreko unitatea. Balioak: 'm/s', 'km/h, 'mph', 'knots', 'Beaufort scale'."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Tenperatura-unitateak"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Hiria, dagokion informazioa mateweather-ek bistaratzeko."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "Tenperaturarentzat erabili beharreko unitatea. Balioak:  'Kelvin', 'Centigrade', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Radar-mapa hartzeko URL pertsonalizatua."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Orain ez da erabiltzen"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Eguneratze automatikoak egiteko denbora-bitartea (segundotan)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Erakutsi radar-mapa"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Erabiliko den presio-unitatea."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hartu radar-mapa bat eguneratze bakoitzean."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Erabiliko den tenperatura-unitatea."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Erabiliko den ikusgaitasun-unitatea."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Leku bateko eguraldiaren informazioa"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Erabiliko den haize-abiadura."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Leku bateko eguraldiaren informazioa."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Eguneratze-maiztasuna"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Eguneratu datuak automatikoki"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Gertuko hiria"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Radar-maparen URLa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Erabili URL pertsonalizatua radar-mapa hartzeko"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Erabili sistema metrikoa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zonaren lekua"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Erabili sistema metrikoa unitate ingelesen ordez."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar kokalekua"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Hiriaren eguraldia"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Leku bateko eguraldiaren informazioa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Hiria, dagokion informazioa mateweather-ek bistaratzeko."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Leku bateko eguraldiaren informazioa."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zonaren lekua"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Kokalekuaren koordenatuak"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Kokalekuaren latitudea eta longitudea honako moduan adieraziz: DD-MM-SS[NS] DD-MM-SS[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Erabili URL pertsonalizatua radar-mapa hartzeko"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Egiazkoa bada, radar-mapa bat eskuratuko du \"radarra\" gakoan zehaztutako lekutik."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Radar-maparen URLa"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Radar-mapa hartzeko URL pertsonalizatua."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +451,6 @@ msgstr "Ipar-mendebaldea"
 msgid "North - Northwest"
 msgstr "Iparraldea - Ipar-mendebaldea"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Baliogabea"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Oskarbi"
diff --git a/po/fa.po b/po/fa.po
index 2646c53..ffa246e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -11,374 +11,363 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/MATE/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "تهران (مهرآباد)‏"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "OIII"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr " "
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "35-41N 051-21E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "پیش‌فرض"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "نامعتبر"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "متر بر ثانیه"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "کیلومتر بر ساعت"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "مایل بر ساعت"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "گره"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "کیلوپاسکال"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "هکتوپاسکال"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "میلی‌بار"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "میلی‌متر جیوه"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "اینچ جیوه"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "کیلومتر"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "به‌هنگام‌سازی خودکار داده‌ها"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "تعیین می‌کند که برنامک به طور خودکار آمار آب و هوا را به‌هنگام بکند یا نه."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "نمایش نقشه‌ی رادار"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "بازه‌ی به‌هنگام‌سازی"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "واحد فاصله"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "بازه‌ی مابین به‌هنگام‌سازی‌های خودکار، بر حسب ثانیه"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "در هر به‌هنگام‌سازی یک نقشه‌ی رادار گرفته شود."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "استفاده از واحدهای متریک"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "اگر «درست» باشد، یک نقشه‌ی رادار از مکان مشخص شده توسط کلید «رادار» گرفته شود."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "استفاده از واحدهای متریک به جای واحدهای انگلیسی."
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "واحد فاصله"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "دیگر استفاده نمی‌شود"
-
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "واحد فشار"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "واحد سرعت"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "واحد دما"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "نشانی اینترنتی سفارشی‌ای که نقشه‌ی رادار از آنجا گرفته می‌شود."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "دیگر استفاده نمی‌شود"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "بازه‌ی مابین به‌هنگام‌سازی‌های خودکار، بر حسب ثانیه"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "نمایش نقشه‌ی رادار"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "واحدی که برای فشار استفاده می‌شود."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "در هر به‌هنگام‌سازی یک نقشه‌ی رادار گرفته شود."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "واحدی که برای دما استفاده می‌شود."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "واحدی که برای دید استفاده می‌شود."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "واحدی که برای سرعت باد استفاده می‌شود."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "بازه‌ی به‌هنگام‌سازی"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "به‌هنگام‌سازی خودکار داده‌ها"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "نشانی اینترنتی نقشه‌ی رادار"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "استفاده از نشانی اینترنتی سفارشی برای نقشه‌ی رادار"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "استفاده از واحدهای متریک"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "استفاده از واحدهای متریک به جای واحدهای انگلیسی."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "استفاده از نشانی اینترنتی سفارشی برای نقشه‌ی رادار"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "اگر «درست» باشد، یک نقشه‌ی رادار از مکان مشخص شده توسط کلید «رادار» گرفته شود."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "نشانی اینترنتی نقشه‌ی رادار"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "نشانی اینترنتی سفارشی‌ای که نقشه‌ی رادار از آنجا گرفته می‌شود."
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -462,11 +451,6 @@ msgstr "شمال غربی"
 msgid "North - Northwest"
 msgstr "شمال ‐ شمال غربی"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "نامعتبر"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "آسمان صاف"
diff --git a/po/fi.po b/po/fi.po
index cce3cd1..c45d94f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,373 +12,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Helsinki-Malmi"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EFHF"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "60-15N 025-03E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Oletus"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Epäkelpo"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr " m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr " km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr " mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "solmua"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Bofori-skaala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr " kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr " hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr " mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr " mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr " inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr " km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwichin aika"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Kolminumeroinen koodi tutkakarttojen hakemiseksi weather.com -palvelusta. Koodit löytyvät tiedostosta http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Yksilöllinen kaupungin alue, kuten määritelty tiedostossa http://git.mate.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Päivitä tiedot automaattisesti"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Määrittää, päivittääkö sovelma automaattisesti säätiedot vai ei."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Näytä tutkakartta"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Matkan yksikkö"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Päivitystiheys"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hae tutkakartta jokaisen päivityksen yhteydessä."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Automaattisten päivitysten päivitystiheys sekunneissa."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Mikäli tämä on päällä, hae tutkakartta \"radar\"-avaimessa määritellystä paikasta."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Käytä SI-järjestelmää"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Sijaintisi leveys- ja pituusasteet muodossa DD-MM-SS[NS] DD-MM-SS[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Käytä SI-järjestelmää englantilaisten yksiköiden sijaan."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Sijainnin koordinaatit"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Lähikaupunki"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Matkan yksikkö"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ei enää käytössä"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Paineen yksikkö"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Tutkan sijainti"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Nopeuden yksikkö"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Lämpötilan yksikkö"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Kaupunki, jolle mateweather näyttää säätietoja"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Mukautettu URL josta tutkakartat haetaan."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ei enää käytössä"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Automaattisten päivitysten päivitystiheys sekunneissa."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Näytä tutkakartta"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Painetta näytettäessä käytettävä yksikkö"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hae tutkakartta jokaisen päivityksen yhteydessä."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Lämpötilaa näytettäessä käytettävä yksikkö."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Näkyvyyttä näytettäessä käytettävä yksikkö"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Sijainnin säätiedot"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Tuulen nopeutta näytettäessä käytettävä yksikkö"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Annetun sijainnin säätiedot."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Päivitystiheys"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Päivitä tiedot automaattisesti"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Lähikaupunki"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Tutkakartan URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Käytä mukautettua osoitetta sääkartalle"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Käytä SI-järjestelmää"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Alueen sijainti"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Käytä SI-järjestelmää englantilaisten yksiköiden sijaan."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Tutkan sijainti"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Kaupunkisää"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Sijainnin säätiedot"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Kaupunki, jolle mateweather näyttää säätietoja"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Annetun sijainnin säätiedot."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Alueen sijainti"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Sijainnin koordinaatit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Sijaintisi leveys- ja pituusasteet muodossa DD-MM-SS[NS] DD-MM-SS[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Käytä mukautettua osoitetta sääkartalle"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Mikäli tämä on päällä, hae tutkakartta \"radar\"-avaimessa määritellystä paikasta."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Tutkakartan URL"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Mukautettu URL josta tutkakartat haetaan."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -463,11 +452,6 @@ msgstr "Luoteinen"
 msgid "North - Northwest"
 msgstr "Pohjoinen - Luoteinen"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Epäkelpo"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Selkeää"
diff --git a/po/fr.po b/po/fr.po
index 3508772..7c8008b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,6 +9,7 @@
 # Claude Paroz <[email protected]>, 2008.
 # Damien Durand <[email protected]>, 2006.
 # Fabrice Bellet <[email protected]>, 2000.
+#  <[email protected]>, 2013.
 #   <[email protected]>, 2012.
 # Robert-André Mauchin <[email protected]>, 2006.
 # Sébastien Bacher <[email protected]>, 2004.
@@ -17,373 +18,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-29 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-28 10:40+0000\n"
 "Last-Translator: mauron <[email protected]>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/MATE/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Paris/Charles De Gaulle"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LFPG"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "49-01N 002-32E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Valeur par défaut"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "℃"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "℉"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Non valide"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nœuds"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Échelle Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Temps moyen de Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un code à trois chiffres pour récupérer les cartes radar de weather.com, comme défini sur http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Une zone unique pour la ville, comme défini sur http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Mettre à jour les données automatiquement"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Détermine si l'applet met à jour ses statistiques météo automatiquement ou pas."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Afficher la carte radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unité de distance"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Fréquence de mise à jour"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Récupère une carte radar à chaque mise à jour."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "L'intervalle en secondes entre les mises à jour automatiques."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Si VRAI, récupère une carte radar du lieu indiqué par la clé « radar »."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Utiliser le système métrique"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitude et longitude de votre lieu écrite en DD-MM-SS[NS] DD-MM-SS[EO]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Utiliser le système métrique au lieu du système anglais."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordonnées du lieu"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'km'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ville proche"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unité de distance"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Zone importante à proximité, par exemple une capitale, tel que l'on peut trouver sur http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "L'unité de visibilité à utiliser. Valeurs : 'meters', 'km', 'miles'."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "N'est plus utilisé"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'hPa'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unité de pression"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Emplacement de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "L'unité de pression à utiliser. Valeurs : 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'km/h'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unité de vitesse"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "L'unité de vitesse du vent à utiliser. Valeurs : 'm/s', 'km/h', 'mph' (miles par heure), 'knots' (nœuds), 'Beaufort scale' (échelle Beaufort)."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unité de température"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ville dont mateweather affiche les informations."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "L'unité de température à utiliser. Valeurs : 'Kelvin', 'Centigrade', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "L'URL personnalisé depuis lequel récupérer une carte radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "N'est plus utilisé"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "L'intervalle en secondes entre les mises à jour automatiques."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Afficher la carte radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "L'unité de pression à utiliser."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Récupère une carte radar à chaque mise à jour."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "L'unité de température à utiliser."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'Paris/Charles De Gaulle'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Information du lieu de météo."
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "L'unité de visibilité à utiliser."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Information du lieu de météo."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "L'unité de vitesse du vent à utiliser."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'LFPG'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ville proche"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Fréquence de mise à jour"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Région majeur à proximité, comme une ville importante, comme défini sur https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'DEFAULT_ZONE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Lieu de la zone"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Mettre à jour les données automatiquement"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Une zone unique pour la ville, comme défini sur https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr "' '"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Emplacement de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL de la carte radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Un code à trois chiffres pour récupérer les cartes radar de weather.com, comme défini sur https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Utiliser un URL personnalisé pour la carte radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Prévisions météo pour une ville"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Utiliser le système métrique"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ville dont mateweather affiche les informations."
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Utiliser le système métrique au lieu du système anglais."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "'49-01N 002-32E'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordonnées du lieu"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Prévisions météo pour une ville"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude et longitude de votre lieu écrite en DD-MM-SS[NS] DD-MM-SS[EO]."
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Information du lieu de météo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Utiliser un URL personnalisé pour la carte radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Information du lieu de météo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Si VRAI, récupère une carte radar du lieu indiqué par la clé « radar »."
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Lieu de la zone"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL de la carte radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "L'URL personnalisé depuis lequel récupérer une carte radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -468,11 +458,6 @@ msgstr "Nord-Ouest"
 msgid "North - Northwest"
 msgstr "Nord - Nord-Ouest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Non valide"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ciel dégagé"
diff --git a/po/ga.po b/po/ga.po
index 5fa6fb2..8f1abf4 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ga\n"
-"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Réamhshocrú"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Neamhbhailí"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "msu"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "muirmhíle"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "scála Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Aonad brú"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Suíomh radair"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Suíomh creasa"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Suíomh radair"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Aimsir le cathair"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Suíomh creasa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr ""
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "Iarthuaisceart"
 msgid "North - Northwest"
 msgstr "Tuaisceart - Iarthuaisceart"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Neamhbhailí"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Spéir Ghlan"
diff --git a/po/gl.po b/po/gl.po
index 99f9cb7..607405b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,377 +9,368 @@
 # Ignacio Casal Quinteiro <[email protected]>, 2008.
 # Ignacio Casal Quinteiro <[email protected]>, 2005, 2006.
 # Mancomún - Centro de Referencia e Servizos de Software Libre <[email protected]>, 2009.
+# manuel meixide <[email protected]>, 2013.
+#  <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 14:13+0000\n"
+"Last-Translator: mauron <[email protected]>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/MATE/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Santiago de Compostela"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LEST"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "\" \""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "42-54N 008-26W"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predefinido"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Non válido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nós"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Meridiano de hora Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un código de tres díxitos para obter os mapas de radar desde weather.com, encontrados a través de http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Unha zona única para a cidade, tal como se encontra en http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizar os datos automaticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina se o miniaplicativo actualiza automaticamente as súas estatísticas de meteoroloxía."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrar o mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidade de distancia"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de actualización"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obter un mapa de radar con cada actualización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "O intervalo en segundos entre as actualizacións automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Se é verdadeiro, obtén un mapa de radar desde a localización especificada pola chave \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitude e lonxitude da súa localización expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usar unidades métricas en vez das unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas da localización"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'miles'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Cidade máis próxima"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidade de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "Unidades para a visibilidade. Valores: 'metros', 'km', 'millas'."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Obsoleto"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'inHg'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidade de presión"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Localización de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "Unidades de presión. Valores: 'kPa', 'hPa', 'MB', 'mmHg \",\" inHg \"atm\"."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'knots'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidade de velocidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "Unidade de velocidade do vento. Valores: 'm/s', 'km/h', 'mph', 'nós', 'escala Beaufort'."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Fahrenheit'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidade de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "A cidade para a cal o Gweather mostra a información."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "Unidades de temperatura. Valores: 'Kelvin', 'Centígrados', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "O URL personalizado desde onde obter un mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Obsoleto"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "O intervalo en segundos entre as actualizacións automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar o mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "A unidade na que medir a presión."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obter un mapa de radar con cada actualización."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "A unidade na que medir a temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'DEFAULT_LOCATION'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Información meteorolóxica dunha localización"
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "A unidade na que medir a visibilidade."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Información meteorolóxica dunha localización."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "A unidade na que medir a velocidade do vento."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'DEFAULT_CODE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Cidade máis próxima"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualización"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Zona principal nas proximidades, como unha capital, tal como se atopan en https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'DEFAULT_ZONE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Localización de zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar os datos automaticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Unha zona única para a cidade, como se atopa en https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr "'DEFAULT_RADAR'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Localización de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "O URL para o mapa de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Un código de tres díxitos para obter os mapas de radar desde weather.com, encontrados a través de https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usar un URL personalizado para o mapa de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Previsión meteorolóxica para unha cidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "A cidade para a cal o Gweather mostra a información."
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usar unidades métricas en vez das unidades inglesas."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "'DEFAULT_COORDINATES'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas da localización"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Previsión meteorolóxica para unha cidade"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude e lonxitude da súa localización expresada en DD-MM-SS[NS] DD-MM-SS[EW]."
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Información meteorolóxica dunha localización"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usar un URL personalizado para o mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Información meteorolóxica dunha localización."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Se é verdadeiro, obtén un mapa de radar desde a localización especificada pola chave \"radar\"."
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Localización de zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "O URL para o mapa de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "O URL personalizado desde onde obter un mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -464,11 +455,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Non válido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ceo limpo"
diff --git a/po/gu.po b/po/gu.po
index 5ca47d2..67c83ff 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "અમદાવાદ"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VAAH"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "23-04N 072-38E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "મૂળભુત"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "અયોગ્ય"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "મી/સેક"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "કિમી/કલાક"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ક્નૉટ્સ"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "બીફોર્ટ માપદંડ"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "કિમી"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com માંથી રડાર નકશાઓ પ્રાપ્ત કરવા માટે ત્રણ-અંક-લાંબો કોડ, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in માંથી મળ્યો"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "શહેર માટેનો અનન્ય ઝોન, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in માંથી મળ્યો"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "માહિતી આપોઆપ બદલો"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "નક્કી કરો કે એપ્લેટ આપોઆપ હવામાનની સ્થિતિઓ બદલે કે નહિ."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "રડારનો નક્શો બતાવો"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "અંતરનો એકમ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "અંતરાલ બદલો"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "દરેક બદલાવ માટે રડારનો નક્શો જુઓ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "આપોઆપ બદલાવો વચ્ચેનો અંતરાલ સેકન્ડમાં."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "જો સાચું હોય, તો \"રડાર\" કી દ્વારા સ્પષ્ટ થયેલ જગ્યામાંથી રડારનો નક્શો મેળવો."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "માપતોલ એકમો વાપરો"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "તમારા સ્થાનનું અક્ષાંશ અને રેખાંશ DD-MM-SS[NS] DD-MM-SS[EW] માં રજૂ થયેલ છે."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "અંગ્રજી એકમોની જગ્યાએ માપતોલ એકમો વાપરો."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "સ્થાન યામાક્ષો"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "નજીકનું શહેર"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "અંતરનો એકમ"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "કંઈ જ વધારે વપરાયું નથી"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "દબાણનો એકમ"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "રડાર સ્થાન"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "ઝડપનો એકમ"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "તાપમાનનો એકમ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "શહેર કે જેના માટેની જાણકારી mateweather દર્શાવે છે."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "કસ્ટમ url કે જેમાંથી રડારનો નક્શો મેળવાય છે."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "કંઈ જ વધારે વપરાયું નથી"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "આપોઆપ બદલાવો વચ્ચેનો અંતરાલ સેકન્ડમાં."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "રડારનો નક્શો બતાવો"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "દબાણ માટે વાપરવાનો એકમ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "દરેક બદલાવ માટે રડારનો નક્શો જુઓ."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "તાપમાન માટે વાપરવાનો એકમ."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "દ્રશ્યમાનતા માટે વાપરવાનો એકમ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "હવામાન સ્થાન જાણકારી"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "પવનનો વેગ માપવા માટેનો એકમ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "સ્થાન હવામાન જાણકારી."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "અંતરાલ બદલો"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "માહિતી આપોઆપ બદલો"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "નજીકનું શહેર"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "રડારના નક્શા માટેની Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "રડારના નક્શા માટે કસ્ટમ url વાપરો"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "માપતોલ એકમો વાપરો"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "ઝોન સ્થાન"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "અંગ્રજી એકમોની જગ્યાએ માપતોલ એકમો વાપરો."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "રડાર સ્થાન"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "શહેર માટેનું હવામાન"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "હવામાન સ્થાન જાણકારી"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "શહેર કે જેના માટેની જાણકારી mateweather દર્શાવે છે."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "સ્થાન હવામાન જાણકારી."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "ઝોન સ્થાન"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "સ્થાન યામાક્ષો"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "તમારા સ્થાનનું અક્ષાંશ અને રેખાંશ DD-MM-SS[NS] DD-MM-SS[EW] માં રજૂ થયેલ છે."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "રડારના નક્શા માટે કસ્ટમ url વાપરો"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "જો સાચું હોય, તો \"રડાર\" કી દ્વારા સ્પષ્ટ થયેલ જગ્યામાંથી રડારનો નક્શો મેળવો."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "રડારના નક્શા માટેની Url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "કસ્ટમ url કે જેમાંથી રડારનો નક્શો મેળવાય છે."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "ઉત્તરપશ્ર્ચિમ"
 msgid "North - Northwest"
 msgstr "ઉત્તર - ઉત્તરપશ્ર્ચિમ"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "અયોગ્ય"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "સ્વચ્છ આકાશ"
diff --git a/po/he.po b/po/he.po
index 9622717..9cd3769 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/MATE/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "תל אביב"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LLSD"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "32-06-53N 034-46-56E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ברירת המחדל"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "לא תקני"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "מטרים לשנייה"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "קילומטרים לשעה"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "מיילים לשעה"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "קשר"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "סולם ביופורט"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "אטמוספירה"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "מטרים"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "קילומטרים"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "מיילים"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "kPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "שעון גריניץ'"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A three-digit-long code for retrieving radar maps from weather.com, found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A unique zone for the city, as found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Update the data automatically"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determines whether the applet automatically updates its weather statistics or not."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Display radar map"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Distance unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Update interval"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "The interval, in seconds, between automatic updates."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Use metric units"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Use metric units instead of english units."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Location coordinates"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distance unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Nearby major zone, such as a capital city, as found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Not used anymore"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Pressure unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Speed unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperature unit"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "The custom url from where to retrieve a radar map."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Not used anymore"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Display radar map"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Fetch a radar map on each update."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "The unit to use for temperature."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Weather location information"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "The unit to use for wind speed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weather location information."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Update interval"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Nearby city"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Use custom url for the radar map"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zone location"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Use metric units instead of english units."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar location"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Weather for a city"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "The city that mateweather displays information for."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Location coordinates"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Use custom url for the radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "If true, then retrieve a radar map from a location specified by the \"radar\" key."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url for the radar map"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "The custom url from where to retrieve a radar map."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "צפון מערב"
 msgid "North - Northwest"
 msgstr "צפון - צפון מערב"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "לא תקני"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "שמיים בהירים"
diff --git a/po/hi.po b/po/hi.po
index 1cc492f..30a13f7 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/MATE/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "New Delhi/Palam"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VIDP"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "28-34N 077-07E"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "मूलभूत रेडार (_R)"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "डिफ़ॉल्ट"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "के"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "सी"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "एफ़"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "अवैध"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "नॉट्स"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ब्यूफोर्ट स्केल"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "मि."
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "किमी"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "अमी"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "ग्रीनविच माध्य समय"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A three-digit-long code for retrieving radar maps from weather.com, found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A unique zone for the city, as found from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "डाटा स्वचालित अद्यतन करें"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "निर्धारित करता है कि क्या एप्लेट इसके मौसम सांख्यिकी को स्वचालित अद्यतन करता है या नहीं."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "रेडार नक्शा दिखाएँ"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "दूरी ईकाई"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "अद्यतन अंतराल"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "प्रत्येक अद्यतन पर एक रेडार नक्शा लाएँ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "स्वचालित अद्यतन करने के बीच सेकण्ड में अंतराल."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "यदि सत्य है, तो एक रेडॉर नक्शा \"रेडॉर\" कुंजी से निर्दिष्ट किए स्थान से लाएँ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "मीट्रिक यूनिट उपयोग करें"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "DD-MM-SS[NS] DD-MM-SS [EW] में आपके द्वारा दिये गये अक्षांस व देशांतर की स्थिति"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "अंग्रेजी यूनिट के बदले मीट्रिक यूनिट उपयोग करें"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "स्थान निर्देशांक"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "निकट का शहर"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "दूरी ईकाई"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "अब उपयोग नहीं होता"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "दबाव ईकाई"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "रडार स्थान"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "गति ईकाई"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "तापमान ईकाई"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "शहर जिसके लिये जीवेदर सूचना देता है."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "जहाँ से रेडार नक़्शा लाना है उसका पसंदीदा यूआरएल."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "अब उपयोग नहीं होता"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "स्वचालित अद्यतन करने के बीच सेकण्ड में अंतराल."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "रेडार नक्शा दिखाएँ"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "दबाव के लिये उपयोग के लिये ईकाई"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "प्रत्येक अद्यतन पर एक रेडार नक्शा लाएँ."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "तापमान के लिये उपयोग के लिये ईकाई."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "दृश्यता के लिये उपयोग के लिये ईकाई"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "मौसम स्थान सूचना"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "वायु गति के लिये उपयोग के लिये ईकाई"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "मौसम स्थान सूचना"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "अद्यतन अंतराल"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "डाटा स्वचालित अद्यतन करें"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "निकट का शहर"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "रेडार नक्शा का यूआरएल"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "रेडार नक्शा हेतु विशेष यूआरएल उपयोग करें"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "मीट्रिक यूनिट उपयोग करें"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "क्षेत्र स्थान"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "अंग्रेजी यूनिट के बदले मीट्रिक यूनिट उपयोग करें"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "रडार स्थान"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "शहर के लिये मौसम"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "मौसम स्थान सूचना"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "शहर जिसके लिये जीवेदर सूचना देता है."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "मौसम स्थान सूचना"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "क्षेत्र स्थान"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "स्थान निर्देशांक"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "DD-MM-SS[NS] DD-MM-SS [EW] में आपके द्वारा दिये गये अक्षांस व देशांतर की स्थिति"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "रेडार नक्शा हेतु विशेष यूआरएल उपयोग करें"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "यदि सत्य है, तो एक रेडॉर नक्शा \"रेडॉर\" कुंजी से निर्दिष्ट किए स्थान से लाएँ."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "रेडार नक्शा का यूआरएल"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "जहाँ से रेडार नक़्शा लाना है उसका पसंदीदा यूआरएल."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "उत्तरपश्चिम"
 msgid "North - Northwest"
 msgstr "उत्तर - उत्तरपश्चिम"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "अवैध"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "स्वच्छ आकाश"
diff --git a/po/hr.po b/po/hr.po
index 6aecc03..8af09d7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,378 +3,368 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/MATE/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr ""
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr ""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr ""
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Neispravno"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr ""
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "čvorova"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Boforova ljestvica"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr ""
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mbar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "milja"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Automatski ažuriraj podatke"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Određuje da li applet automatski ažurira prognozu ili ne."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Prikaži radarsku mapu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Vrijeme obnavljanja"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Jedinica za udaljenost"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Razmak, u sekundama, između dva osvježavanja."
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Preuzmi radarsku mapu pri svakom ažuriranju."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Koristiti metrički sustav jedinica"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Koristi metrički sustav jedinica umjesto engleskog sistema."
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinate lokacijie"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Jedinica za udaljenost"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Više se ne koristi"
-
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
+msgstr "Jedinica za tlak"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
+msgstr "Jedinica za brzinu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Jedinica za temperaturu"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Adresa odakle se dohvaća radarska mapa."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Više se ne koristi"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Razmak, u sekundama, između dva osvježavanja."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Prikaži radarsku mapu"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Preuzmi radarsku mapu pri svakom ažuriranju."
+
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Vrijeme obnavljanja"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Automatski ažuriraj podatke"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Adresa za radarsku mapu"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Koristi odabranu adresu za radarsku mapu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Koristiti metrički sustav jedinica"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Koristi metrički sustav jedinica umjesto engleskog sistema."
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Grad o kojem mateweather prikazuje informacije."
+
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinate lokacijie"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Koristi odabranu adresu za radarsku mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Adresa za radarsku mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Adresa odakle se dohvaća radarska mapa."
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -458,11 +448,6 @@ msgstr "Sjeverozapadni"
 msgid "North - Northwest"
 msgstr "Sjever - sjeverozapad"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Neispravno"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Vedro"
diff --git a/po/hu.po b/po/hu.po
index 9a12d76..d661069 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,378 +9,368 @@
 # Gabor Sari <saga dot mate dot hu>, 2003.
 # Laszlo Dvornik <dvornik dot mate dot hu>, 2004.
 # Mate ORY <orymate at gmail d0t com>, 2006.
+# Rezső Páder <[email protected]>, 2013.
 # Szabolcs Ban <shooby dot mate dot hu>, 1999, 2000, 2001, 2002, 2003.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-22 13:24+0000\n"
+"Last-Translator: Rezső Páder <[email protected]>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/MATE/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Budapest"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LHBP"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "47-26N 019-16E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Alapértelmezett"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Érvénytelen"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "csomó"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort skála"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mé"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich-i középidő"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Háromjegyű kód a radartérképek letöltéséhez a weather.com-ról, lásd: http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "A város egyedi zónája, lásd: http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Automatikus adatfrissítés"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Eldönti, hogy a kisalkalmazás automatikusan frissítse-e az időjárás-statisztikáit vagy sem."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Radarkép megjelenítése"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Távolság mértékegysége"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Frissítés gyakorisága"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Radarkép lehívása minden frissítéskor."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "A frissítés intervalluma, másodpercben."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ha be van állítva, a „radar” kulcs által megadott helyről lehívja a radarképet."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Metrikus mértékegységek használata"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Az Ön helyéhez használandó szélesség és hosszúság FF-PP-MM[ÉD] FF-PP-MM[KNy] alakban kifejezve. "
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Metrikus mértékegységek használata az angolszász egységek helyett."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Hely koordinátái"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'miles'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Közeli város"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Távolság mértékegysége"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "A megjelenítéshez használt mértékegység. Értékek: 'méter', 'km' ,'mérföld'."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Már nem használt"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'inHg'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Nyomás mértékegysége"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radar helye"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "A nyomáshoz használt mértékegység. Értékek: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'knots'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Sebesség mértékegysége"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "A szél sebességének mértékegysége. Értékek: 'm/s', 'km/h, 'mph', 'csomó', 'Beaufort-skála'."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Fahrenheit'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Hőmérséklet mértékegysége"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "A város, amely információit a mateweather megjeleníti."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "A hőmérséklethez használt mértékegység. Értékek: 'Kelvin', 'Centigrade', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "A letöltendő radartérkép helyének beállítása (URL)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Már nem használt"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "A frissítés intervalluma, másodpercben."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Radarkép megjelenítése"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "A nyomásnál használandó mértékegység."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Radarkép lehívása minden frissítéskor."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "A hőmérsékletnél használandó mértékegység."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "A látási viszonyokhoz használandó mértékegység."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Időjárási helyinformációk"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "A szélsebességhez használandó mértékegység."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Időjárási helyinformációk."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Frissítés gyakorisága"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Automatikus adatfrissítés"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Közeli város"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Műholdas térképek URL-je"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Közeli nagyobb zóna, pl. megyeszékhely, lásd: https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Egyéni URL használata a műholdas térképhez"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zóna helye"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Metrikus mértékegységek használata"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "A város egyedi zónája, lásd: https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Metrikus mértékegységek használata az angolszász egységek helyett."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar helye"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Háromjegyű kód a radartérképek letöltéséhez a weather.com-ról, lásd: https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Egy város időjárása"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Időjárási helyinformációk"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "A város, amely információit a mateweather megjeleníti."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Időjárási helyinformációk."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zóna helye"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Hely koordinátái"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Az Ön helyéhez használandó szélesség és hosszúság FF-PP-MM[ÉD] FF-PP-MM[KNy] alakban kifejezve. "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Egyéni URL használata a műholdas térképhez"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ha be van állítva, a „radar” kulcs által megadott helyről lehívja a radarképet."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Műholdas térképek URL-je"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "A letöltendő radartérkép helyének beállítása (URL)."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -465,11 +455,6 @@ msgstr "Északnyugat"
 msgid "North - Northwest"
 msgstr "Észak - északnyugat"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Érvénytelen"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Tiszta ég"
diff --git a/po/hy.po b/po/hy.po
index f83546e..af18b24 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -8,374 +8,363 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Հիմնական վայր"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "Դեֆոլտ կոդ"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "Դեֆոլտ գոտի"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "Հիմնական ռադար"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "Դեֆոլտ կոորդինատներ"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Դեֆոլտ"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Անթույլատրելի"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "մ/վ"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "կմ/ժ"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "մղոն/ժ"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "հանգույց"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Բեոֆորտյան սանդղակ"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "ԿիլոՊասկալ"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "ՀեկտոՊասկալ"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "Միլիբար"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "Մմ սնդկիկի սյուն"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "Դույմ սնդիկի սյուն"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Կմ"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "Ջերմաստիճանի_հիմնական_միավոր"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "Արագության_հիմնական_միավոր"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "Ճնշման_հիմնական_միավոր"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "Տարածության_հիմնական_միավոր"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Տվյալները ավտոմատ նորացնել"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Որոշում է արդյոք ապլետը ավտոմատ կերպով նորացնում է եղանակի տեղեկատվությունը թե ոչ"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Ցույց է տալիս ռադարային քարտեզը"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Նորացման ժամանակահատված"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Տարածության միավորներ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Ավտոմատ նորացումների միջև ժամանակահատվածը վայրկյաններով"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Ռադարային քարտեզը փոխել յուրաքանչյուր նորացման ժամանակ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Օգտագործել մետրիկ համակարգ"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Եթե միացված է, ապա ռադարային քարտեզը ստանալ \"ռադար \"ստեղնով ընտրված հասցեից"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Օգտագործել մետրիկ համակարգ անգլիականի փոխարեն"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Տարածության միավորներ"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Այլևս չի օգտագործվում"
-
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Ճնշման միավոր"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Արագության միավոր"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Ջերմաստիճանի միավոր"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Գործարկողի տեղեկատվական ռեսուրսի ցուցիչ ռադարային քարտեզի ստացման համար"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Այլևս չի օգտագործվում"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Ավտոմատ նորացումների միջև ժամանակահատվածը վայրկյաններով"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Ցույց է տալիս ռադարային քարտեզը"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Ճնշման համար օգտագործվող միավոր"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Ռադարային քարտեզը փոխել յուրաքանչյուր նորացման ժամանակ"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Ջերմաստիճանի համար օգտագործվող միավոր"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Տեսանելիության միավորներ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Քամու արագության միավորներ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Նորացման ժամանակահատված"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Տվյալները ավտոմատ նորացնել"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Տեղեկատվական ռեսուրս ռադարային քարտեզի համար"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Օգտագործել գործարկողի տեղեկատվական ռեսուրսը ռադարային քարտեզի համար"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Օգտագործել մետրիկ համակարգ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Օգտագործել մետրիկ համակարգ անգլիականի փոխարեն"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Օգտագործել գործարկողի տեղեկատվական ռեսուրսը ռադարային քարտեզի համար"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Եթե միացված է, ապա ռադարային քարտեզը ստանալ \"ռադար \"ստեղնով ընտրված հասցեից"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Տեղեկատվական ռեսուրս ռադարային քարտեզի համար"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Գործարկողի տեղեկատվական ռեսուրսի ցուցիչ ռադարային քարտեզի ստացման համար"
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -459,11 +448,6 @@ msgstr "Հյուսիս արևմտյան"
 msgid "North - Northwest"
 msgstr "Հյուսիս–հյուսիս արևմտյան"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Անթույլատրելի"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Հստակ երկինք"
diff --git a/po/id.po b/po/id.po
index 1969e4d..f771312 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4,377 +4,367 @@
 # 
 # Translators:
 # ahmad riza h nst <[email protected]>, 2004.
+# ibnu daru aji <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-12 11:16+0000\n"
+"Last-Translator: andjeng <[email protected]>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/MATE/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Standar"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Salah"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/detik"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/jam"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mil per jam"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knot"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Skala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mil"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Tiga digit panjang kode untuk menerima peta radar dari weather.com, ditemukan dari http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Zona unik untuk kota, seperti pada http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Perbarui data secara otomatis"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Tentukan apakah applet secara otomatis memperbarui statistik cuacanya atau tidak."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Tampilkan peta radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unit jarak"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Jarak waktu pembaruan"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Ambil sebuah peta radar pada setiap kali pembaruan data."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Jarak, dalam detik, antara update otomatis."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Jika benar, maka terima sebuah peta radar dari sebuah lokasi yang ditentukan oleh kunci \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Gunakan unit meter"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Lintang dan bujur dari lokasi Anda ditampilkan dalam DD-MM-SS[NS]·DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Gunakan unit meter dari pada unit Inggris."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinat lokasi"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'miles'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Kota terdekat"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unit jarak"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Zona utama terdekat, seperti ibu kota, as·found·from·http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "Unit yang diperlihatkan. Nilai 'meter', 'km', 'mil'"
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Tidak dipergunakan lagi"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'inHg'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unit tekanan"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Lokasi radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "Unit yang digunakan untuk tekanan. Nilai: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg', 'atm'."
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'knots'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unit kecepatan"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "Unit yang digunakan untuk kecepatan angin. Nilai: 'm/s', 'km/jam', 'mph', 'knot', 'Skala Beaufort'."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Fahrenheit'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unit suhu"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Kota yang informasinya mau ditampilkan mateweather."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "Unit yang digunakan untuk temperatur. Nilai: 'Kelvin', 'Centigrade', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Url tersendiri dari di mana untuk menerima sebuah peta radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Tidak dipergunakan lagi"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Jarak, dalam detik, antara update otomatis."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Tampilkan peta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Unit yang dipergunakan untuk tekanan."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Ambil sebuah peta radar pada setiap kali pembaruan data."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Unit yang dipergunakan untuk tekanan."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'DEFAULT_LOCATION'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informasi lokasi cuaca."
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Unit yang dipergunakan untuk jarak pandang."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informasi lokasi cuaca."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Unit yang dipergunakan untuk kecepatan angin."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'DEFAULT_CODE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Kota terdekat"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Jarak waktu pembaruan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Dekat dengan zona utama, seperti ibu kota, sebagai mana yang tercantum pada  https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'DEFAULT_ZONE"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zona lokasi"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Perbarui data secara otomatis"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Zona unik untuk kota, sebagai mana yang tercantum pada https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in "
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr "'DEFAULT_RADAR'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Lokasi radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url untuk peta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Tiga digit panjang kode untuk menerima peta radar dari weather.com, ditemukan dari http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Gunakan url tersendiri untuk peta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Prakiraan Cuaca untuk kota"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Gunakan unit meter"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Kota yang informasinya mau ditampilkan mateweather."
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Gunakan unit meter dari pada unit Inggris."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "DEFAULT_COORDINATES"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Prakiraan Cuaca untuk kota"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinat lokasi"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informasi lokasi cuaca."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Lintang dan bujur dari lokasi Anda ditampilkan dalam DD-MM-SS[NS]·DD-MM-SS[EW]."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informasi lokasi cuaca."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Gunakan url tersendiri untuk peta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zona lokasi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Jika benar, maka terima sebuah peta radar dari sebuah lokasi yang ditentukan oleh kunci \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url untuk peta radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Url tersendiri dari di mana untuk menerima sebuah peta radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +449,6 @@ msgstr "Barat Laut"
 msgid "North - Northwest"
 msgstr "Utara - BaratLaut"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Salah"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Langit Cerah"
diff --git a/po/is.po b/po/is.po
index 6f0f393..0ce2e05 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-06-05 10:59+0000\n"
-"Last-Translator: Sveinn í Felli <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Icelandic <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Reykjavík"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "BIRK"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "Atlantic/Reykjavik"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "64.150000 -21.950000"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Sjálfgefið"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ógilt"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/sek"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/klst"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mi/klst"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "hnútar"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort kvarði"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/sek"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Miðtími Greenwich GMT"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Þriggja stafa kóði til að ná í radarmyndir frá weather.com, kóðan má finna á http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Skilgreining fyrir svæði borgarinnar, eins og skilgreint er á http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Uppfæra gögnin sjálfvirkt"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Stýrir hvort smáforritið nær sjálfkrafa í uppfærðar veðurupplýsingar eða ekki."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Sýna radarmynd"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Eining fyrir vegalengdir"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Uppfærslutíðni"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Ná í radarmynd við hverja uppfærslu."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Tímabil, í sekúndum milli sjálfvirkra uppfærslna."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ef þetta er valið verður náð í yfirlitsmynd með radarupplýsingum sem skilgreindar eru með \"Radar\" hnappnum."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Nota metrakerfi"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Breidd og lengd staðsetningar þinnar, skilgreint sem DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Nota metrakerfið í staðin fyrir enskar einingar."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Hnit staðsetningar"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Næsta bæjarfélag"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Eining fyrir vegalengdir"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Næsti umtalsverði byggðakjarni, svo sem borg eða kauptún, sem skilgreind eru í http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ekki notað lengur"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Eining fyrir þrýsting"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Staðsetning radars"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Eining fyrir hraða"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Eining fyrir hitastig"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Borgin sem mateweather birtir upplýsingar fyrir."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Sérsniðin slóð sem notuð er til að finna radarmynd."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ekki notað lengur"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Tímabil, í sekúndum milli sjálfvirkra uppfærslna."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Sýna radarmynd"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Mælieining sem nota á fyrir þrýsting."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Ná í radarmynd við hverja uppfærslu."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Mælieining sem nota á fyrir hitastig."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Mælieining sem nota á fyrir skyggni."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Upplýsingar um núverandi staðsetningu veðurupplýsinga"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Mælieining sem nota á fyrir vindhraða."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Staðsetning veðurupplýsinga"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Uppfærslutíðni"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Uppfæra gögnin sjálfvirkt"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Næsta bæjarfélag"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Slóð fyrir radarmyndir"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Nota sérsniðna slóð fyrir radarmyndir"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Nota metrakerfi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Svæði"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Nota metrakerfið í staðin fyrir enskar einingar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Staðsetning radars"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Veður í ákveðinni borg"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Upplýsingar um núverandi staðsetningu veðurupplýsinga"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Borgin sem mateweather birtir upplýsingar fyrir."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Staðsetning veðurupplýsinga"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Svæði"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Hnit staðsetningar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Breidd og lengd staðsetningar þinnar, skilgreint sem DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Nota sérsniðna slóð fyrir radarmyndir"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ef þetta er valið verður náð í yfirlitsmynd með radarupplýsingum sem skilgreindar eru með \"Radar\" hnappnum."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Slóð fyrir radarmyndir"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Sérsniðin slóð sem notuð er til að finna radarmynd."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Norðvestan"
 msgid "North - Northwest"
 msgstr "Norð - Norðvestan"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ógilt"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Heiðskírt"
diff --git a/po/it.po b/po/it.po
index 87a880d..3607a4a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,377 +6,367 @@
 #   <[email protected]>, 2012.
 # Luca Ferretti <[email protected]>, 2008.
 # Milo Casagrande <[email protected]>, 2009.
+# Stefano Karapetsas <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-03-11 14:52+0000\n"
-"Last-Translator: talorno <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/MATE/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Roma/Urbe"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LIRU"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "41-57N 012-30E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Predefinita"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "Kelvin"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "Celsius"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "Farenheit"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Non valido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "Metri al secondo"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Kilometri all'ora"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "Miglia all'ora"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "Nodi"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Scala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "Kilopascal"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "Ettopascal"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "Millibar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "Millimetri di mercurio"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "Pollici di mercurio"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "Atmosfere"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "Metri"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Kilometri"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "Miglia"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Tempo medio di Greenwich (GMT)"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Codice a tre cifre per il recupero delle mappe radar da weather.com, come indicato in http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Zona univoca per la città, come indicato in http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Aggiornare i dati automaticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina se l'applet deve aggiornare automaticamente le statistiche meteo oppure no."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostrare la mappa radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unità di distanza"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervallo di aggiornamento"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Scaricare una mappa radar ad ogni aggiornamento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "L'intervallo in secondi fra ogni aggiornamento automatico."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Se impostata a vero, viene scaricata una mappa radar da una posizione specificata nella chiave \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usare il sistema metrico decimale"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitudine e longitudine della propria località espresse come \"GG-MM-SS[NS] GG-MM-SS[EW]\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usare il sistema metrico decimale invece del sistema inglese."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordinate della località"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'meters'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Città vicina"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unità di distanza"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "La più grande zona vicina, come una capitale, trovata in http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Non più usato"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'kPa'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unità di pressione"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Località del radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'m/s'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unità di velocità"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unità di temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La città su cui mateweather mostra informazioni"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "URL personalizzata da cui recuperare una mappa radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Non più usato"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "L'intervallo in secondi fra ogni aggiornamento automatico."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrare la mappa radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "L'unità di misura da usare per la pressione."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Scaricare una mappa radar ad ogni aggiornamento."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "L'unità di misura da usare per la temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "L'unità di misura da usare per la visibilità."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informazioni meteo per località"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "L'unità di misura da usare per la velocità del vento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informazioni meteo per località."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervallo di aggiornamento"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Aggiornare i dati automaticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Città vicina"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL per la mappa radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usare URL personalizzata per la mappa radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usare il sistema metrico decimale"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Ubicazione fuso orario"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usare il sistema metrico decimale invece del sistema inglese."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Località del radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Condizioni per una città"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informazioni meteo per località"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La città su cui mateweather mostra informazioni"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informazioni meteo per località."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Ubicazione fuso orario"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordinate della località"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitudine e longitudine della propria località espresse come \"GG-MM-SS[NS] GG-MM-SS[EW]\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usare URL personalizzata per la mappa radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Se impostata a vero, viene scaricata una mappa radar da una posizione specificata nella chiave \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL per la mappa radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "URL personalizzata da cui recuperare una mappa radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +451,6 @@ msgstr "Nord-Ovest"
 msgid "North - Northwest"
 msgstr "Nord / Nord-Ovest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Non valido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cielo sereno"
diff --git a/po/ja.po b/po/ja.po
index 9a60e2b..76ffc1a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ABE Tsunehiko <[email protected]>, 2013.
 # Akira TAGOH <[email protected]>, 2001.
 # Eiichiro ITANI <[email protected]>, 1999.
 # KAMAGASAKO Masatoshi <[email protected]>, 2003.
@@ -17,373 +18,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-15 02:08+0000\n"
+"Last-Translator: 読み専(先行量産型) <[email protected]>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/MATE/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "新東京国際空港 (成田)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "RJAA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "JAXX0085"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "デフォルト"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "ケルビン"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "摂氏"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "華氏"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "不正"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "メートル/秒"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "キロメートル/時"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "マイル/時"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ノット"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ビューフォート（風力）階級"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "キロパスカル"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "ヘクトパスカル"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "ミリバール"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg (水銀柱ミリメートル)"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg (水銀柱インチ)"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "アトム"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "メートル"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "キロメートル"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "マイル"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "グリニッジ標準時"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com からレーダー・マップを取得するのに必要な３桁の数値です。詳細は http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in を参照して下さい。"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "都市を一意に識別するためゾーンです。詳細は http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in を参照して下さい。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "自動的にデータを更新する"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "天気の統計情報を自動的に更新するかどうかを決定します"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "レーダー・マップの表示"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "距離の単位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "更新間隔"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "更新時にレーダー・マップを同期します。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "自動的に更新する間隔 (秒単位) です。"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "TRUE にすると、\"radar\" キーで指定した場所のレーダー・マップを取得します。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "メートル表記を使用する"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "場所の緯度と経度を DD-MM-SS[NS] DD-MM-SS [EW] で表したものです。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "英国単位のかわりにメートル表記を使用します。"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "場所の座標"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'miles'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "近隣都市"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "距離の単位"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "視界の単位。m、km、マイルを選択可能です。"
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "未使用"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'inHg'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "気圧の単位"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "レーダーの場所"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "圧力の単位。kPa、hPa、mb、mmHg、inHg、atmを選択可能です。"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'knots'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "風速の単位"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "風速の単位。m/s、km/h、mph、ノット、ビューフォート階級を選択可能です。"
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Fahrenheit'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "気温の単位"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "お天気 MATE で情報を表示する都市です。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "温度の単位。ケルビン、摂氏、華氏を選択可能です。"
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "レーダー・マップを取得する URL です。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "未使用"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "自動的に更新する間隔 (秒単位) です。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "レーダー・マップの表示"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "使用する気圧の単位です。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "更新時にレーダー・マップを同期します。"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "使用する気温の単位です。"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "使用する視界の単位です。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "都市情報"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "使用する風速の単位です。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "場所に関連する情報です。"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "更新間隔"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "自動的にデータを更新する"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "近隣都市"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "レーダー・マップの URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "首都などの、近くの有名なゾーンです。詳細は https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in を参照してください。"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "レーダー・マップの URL をカスタマイズする"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "ゾーン"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "メートル表記を使用する"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "都市を一意に識別するためゾーンです。詳細はhttps://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in を参照して下さい。"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "英国単位のかわりにメートル表記を使用します。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "レーダーの場所"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "weather.com からレーダー・マップを取得するのに必要な３桁の数値です。詳細は https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in を参照して下さい。"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "都市の天気"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "都市情報"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "お天気 MATE で情報を表示する都市です。"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "場所に関連する情報です。"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "ゾーン"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "場所の座標"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "場所の緯度と経度を DD-MM-SS[NS] DD-MM-SS [EW] で表したものです。"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "レーダー・マップの URL をカスタマイズする"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "TRUE にすると、\"radar\" キーで指定した場所のレーダー・マップを取得します。"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "レーダー・マップの URL"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "レーダー・マップを取得する URL です。"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -468,11 +458,6 @@ msgstr "北西"
 msgid "North - Northwest"
 msgstr "北北西"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "不正"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "快晴"
diff --git a/po/ka.po b/po/ka.po
index a502478..bdd9914 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ka\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "თბილისი/თბილისის აეროპორტი"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "UUEE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "55-59N 037-30E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ნაგულისხმევი"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "მიუღებელი"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "მ/წ"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "კმ/ს"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "მილი/საათში"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "კვანძი"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ბოფორტის შკალა"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "კილოპასკალი"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "ჰექტოპასკალი"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "მილიბარი"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "მმ ვერცხლ.წყ"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "დიუიმი ვერცხლ.წყ"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "კმ"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C°"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "მ/წმ"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "გ/ცელსიუსი"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "კმ"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "მონაცემების ავტომატური განახლება"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "ქალაქის მიხედვით ინფორმაციის ავტომატური განსაზღვრა."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "რადარული რუქის ჩვენება"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "მანძილის ერთეული"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "განახლების ინტერვალი"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ყოველი განახლებისას რადარული რუქის შეცვლა."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "ინტერვალი (წამებში) ავტომატურ განახლებებს შორის."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "თუ ჩართულია, რადარის რუქის მიღება განხორციელდება გასაღებ \"radar\"-ის მიხედვით."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "მეტრული სისტემის გამოყენება"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "თქვენი მდებარეობის განედი და გრძედი წარმოდგენილია DD-MM-SS[NS] DD-MM-SS[EW] ფორმატში."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ინგლისური ერთეულების მაგივრად მეტრული სისტემის გამოყენება"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "მდებარეობის კოორდინატები"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "ახლომდებარე ქალაქი"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "მანძილის ერთეული"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "აღარ გამოიყენება"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "წნევის ერთეული"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "რადარის მდებარეობა"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "სიჩქარის ერთეული"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "ტემპერატურის ერთეული"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "ქალაქი რომლისთვისაც mateweather-ი ინფორმაციას აჩვენებს"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "საკუთარი მისამართი საიდანაც რადარის რუქის მიღებაა შესაძლებელი."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "აღარ გამოიყენება"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "ინტერვალი (წამებში) ავტომატურ განახლებებს შორის."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "რადარული რუქის ჩვენება"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "წნევის განმსაზღვრელი ერთეული."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ყოველი განახლებისას რადარული რუქის შეცვლა."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "ტემპერატურის განმსაზღვრელი ერთეული."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "ხილვადობის განმსაზღვრელი ერთეული."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "ადგილმდებაეობის ამინდის შესახებ ინფორმაცია"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "ქარის სიჩქარის განმსაზღვრელი ერთეული."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "ადგილმდებაეობის ამინდის შესახებ ინფორმაცია."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "განახლების ინტერვალი"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "მონაცემების ავტომატური განახლება"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "ახლომდებარე ქალაქი"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "რადარული რუქის მისამართი"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "რადარული რუქისთვის საკუთარი მისამართის გამოყენება"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "მეტრული სისტემის გამოყენება"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "ზონის მდებარეობა"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ინგლისური ერთეულების მაგივრად მეტრული სისტემის გამოყენება"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "რადარის მდებარეობა"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "ქალაქის ამინდი"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "ადგილმდებაეობის ამინდის შესახებ ინფორმაცია"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "ქალაქი რომლისთვისაც mateweather-ი ინფორმაციას აჩვენებს"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "ადგილმდებაეობის ამინდის შესახებ ინფორმაცია."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "ზონის მდებარეობა"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "მდებარეობის კოორდინატები"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "თქვენი მდებარეობის განედი და გრძედი წარმოდგენილია DD-MM-SS[NS] DD-MM-SS[EW] ფორმატში."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "რადარული რუქისთვის საკუთარი მისამართის გამოყენება"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "თუ ჩართულია, რადარის რუქის მიღება განხორციელდება გასაღებ \"radar\"-ის მიხედვით."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "რადარული რუქის მისამართი"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "საკუთარი მისამართი საიდანაც რადარის რუქის მიღებაა შესაძლებელი."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "ჩრდილო-დასავლეთის"
 msgid "North - Northwest"
 msgstr "ჩრდილო-ჩრდილო-დასავლეთის"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "მიუღებელი"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "სუფთა ცა"
diff --git a/po/kn.po b/po/kn.po
index 88733de..02c54c0 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:17+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/MATE/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: kn\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "ಬೆಂಗಳೂರು"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VOBG"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "12-57N 077-40E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ಅಮಾನ್ಯ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ನಾಟ್‌ಗಳು"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ಬೋಫರ್ಟ್ ಘಟಕ"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "ಗ್ರೀನ್‌ವಿಚ್ ಸರಾಸರಿ ಸಮಯ"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com ನಿಂದ ರಾಡಾರ್ ನಕ್ಷೆಗಳನ್ನು ಪಡೆಯಲು ಬಳಸಲಾಗುವ ಮೂರು ಅಂಕಿಗಳ ಒಂದು ಕೋಡ್, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ನಲ್ಲಿ ಕಂಡು ಬಂದಂತೆ"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "ನಗರದ ಒಂದು ವಿಶಿಷ್ಟ ವಲಯ, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ನಲ್ಲಿ ಕಂಡು ಬಂದಂತೆ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "ಮಾಹಿತಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಪ್ ಡೇಟ್ ಮಾಡು"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "ಹವಾಮಾನ ಆಪ್ಲೆಟ್‌ ತಾನಾಗಿಯೆ ಹವಾಮಾನ ಅಂಕಿಅಂಶಗಳನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುತ್ತದೆಯೆ ಅಥವ ಇಲ್ಲವೆ ಎಂದು ನಿರ್ಧರಿಸುತ್ತದೆ."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "ರಾಡಾರ್ ನಕ್ಷೆಯನ್ನು ಪ್ರದರ್ಶಿಸು"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "ದೂರದ/ಅಂತರದ ಮಾಪಕ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "ಅಪ್ಡೇಟ್‌ನ ನಡುವಿನ ಅಂತರ"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ಪ್ರತಿಯೊಂದು ಅಪ್ಡೇಟಿನಲ್ಲೂ ರಾಡಾರ್ ನಕ್ಷೆಯನ್ನು ಪಡೆದುಕೋ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "ಸ್ವಯಂಚಾಲಿತ ಅಪ್ಡೇಟ್‌ಗಳ ನಡುವಿನ ವಿರಾಮ, ಸೆಕೆಂಡುಗಳಲ್ಲಿ."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "ಇದು ಸತ್ಯವಾಗಿದ್ದರೆ, ರಾಡಾರ್ ನಕ್ಷೆಯನ್ನು \"ರಾಡಾರ್\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾದ ಒಂದು ಸ್ಥಳದಿಂದ ಪಡೆದುಕೊಳ್ಳಿ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "ಮೆಟ್ರಿಕ್‌ ಘಟಕಗಳನ್ನು ಉಪಯೋಗಿಸಿ"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "ನೀವಿರುವ ಜಾಗದ ರೇಖಾಂಶ ಮತ್ತು ಅಕ್ಷಾಂಶವನ್ನು DD-MM-SS[NS] DD-MM-SS[EW] ಮಾದರಿಯಲ್ಲಿ ತೋರಿಸಲಾಗಿದೆ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ಇಂಗ್ಲೀಷ್ ಘಟಕಗಳ ಬದಲಾಗಿ ಮೆಟ್ರಿಕ್ ಪದ್ದತಿಯ ಘಟಕಗಳನ್ನು ಉಪಯೋಗಿಸಿ."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "ಸ್ಥಳದ ನಿರ್ದೇಶಾಂಕಗಳು"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "ಹತ್ತಿರದ ಪಟ್ಟಣ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "ದೂರದ/ಅಂತರದ ಮಾಪಕ"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "ಇದು ಈಗ ಬಳಸಲ್ಪಡುವುದಿಲ್ಲ"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "ಒತ್ತಡದ ಘಟಕ"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ರಾಡರಿನ ಸ್ಥಳ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "ವೇಗದ ಘಟಕ"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "ತಾಪಮಾನದ ಘಟಕ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather ಹವಾಗುಣದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುತ್ತಿರುವ ಊರು."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ಒಂದು ರಾಡರಿನ ನಕ್ಷೆಯನ್ನು ಮರಳಿ ಪಡೆದುಕೊಳ್ಳಬೇಕಿರುವ ಕಸ್ಟಮ್ ಯುಆರ್ಎಲ್."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "ಇದು ಈಗ ಬಳಸಲ್ಪಡುವುದಿಲ್ಲ"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "ಸ್ವಯಂಚಾಲಿತ ಅಪ್ಡೇಟ್‌ಗಳ ನಡುವಿನ ವಿರಾಮ, ಸೆಕೆಂಡುಗಳಲ್ಲಿ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "ರಾಡಾರ್ ನಕ್ಷೆಯನ್ನು ಪ್ರದರ್ಶಿಸು"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "ಒತ್ತಡಕ್ಕಾಗಿ ಬಳಸಬೇಕಿರುವ ಘಟಕ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ಪ್ರತಿಯೊಂದು ಅಪ್ಡೇಟಿನಲ್ಲೂ ರಾಡಾರ್ ನಕ್ಷೆಯನ್ನು ಪಡೆದುಕೋ"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "ತಾಪಮಾನಕ್ಕಾಗಿ ಬಳಸಬೇಕಿರುವ ಘಟಕ."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "ಗೋಚರಿಕೆಗೆ ಬಳಸಬೇಕಿರುವ ಘಟಕ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "ಹವಾಗುಣದ ಸ್ಥಳದ ಮಾಹಿತಿ"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "ಗಾಳಿಯ ವೇಗಕ್ಕಾಗಿ ಬಳಸಬೇಕಿರುವ ಘಟಕ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "ಹವಾಗುಣದ ಸ್ಥಳದ ಮಾಹಿತಿ."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "ಅಪ್ಡೇಟ್‌ನ ನಡುವಿನ ಅಂತರ"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "ಮಾಹಿತಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಪ್ ಡೇಟ್ ಮಾಡು"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "ಹತ್ತಿರದ ಪಟ್ಟಣ"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "ರಾಡರಿನ ನಕ್ಷೆಗಾಗಿನ Url "
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ರಾಡರನ ನಕ್ಷೆಗೆ ಕಸ್ಟಮ್ ಯುಆರ್ಎಲ್ ಅನ್ನು ಬಳಸು"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "ಮೆಟ್ರಿಕ್‌ ಘಟಕಗಳನ್ನು ಉಪಯೋಗಿಸಿ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "ವಲಯದ ಸ್ಥಳ"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ಇಂಗ್ಲೀಷ್ ಘಟಕಗಳ ಬದಲಾಗಿ ಮೆಟ್ರಿಕ್ ಪದ್ದತಿಯ ಘಟಕಗಳನ್ನು ಉಪಯೋಗಿಸಿ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ರಾಡರಿನ ಸ್ಥಳ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "ನಗರದ ಹವಾಗುಣ"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "ಹವಾಗುಣದ ಸ್ಥಳದ ಮಾಹಿತಿ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather ಹವಾಗುಣದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುತ್ತಿರುವ ಊರು."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "ಹವಾಗುಣದ ಸ್ಥಳದ ಮಾಹಿತಿ."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "ವಲಯದ ಸ್ಥಳ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "ಸ್ಥಳದ ನಿರ್ದೇಶಾಂಕಗಳು"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "ನೀವಿರುವ ಜಾಗದ ರೇಖಾಂಶ ಮತ್ತು ಅಕ್ಷಾಂಶವನ್ನು DD-MM-SS[NS] DD-MM-SS[EW] ಮಾದರಿಯಲ್ಲಿ ತೋರಿಸಲಾಗಿದೆ."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ರಾಡರನ ನಕ್ಷೆಗೆ ಕಸ್ಟಮ್ ಯುಆರ್ಎಲ್ ಅನ್ನು ಬಳಸು"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "ಇದು ಸತ್ಯವಾಗಿದ್ದರೆ, ರಾಡಾರ್ ನಕ್ಷೆಯನ್ನು \"ರಾಡಾರ್\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾದ ಒಂದು ಸ್ಥಳದಿಂದ ಪಡೆದುಕೊಳ್ಳಿ."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "ರಾಡರಿನ ನಕ್ಷೆಗಾಗಿನ Url "
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ಒಂದು ರಾಡರಿನ ನಕ್ಷೆಯನ್ನು ಮರಳಿ ಪಡೆದುಕೊಳ್ಳಬೇಕಿರುವ ಕಸ್ಟಮ್ ಯುಆರ್ಎಲ್."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "ಉತ್ತರಪಶ್ಚಿಮ"
 msgid "North - Northwest"
 msgstr "ಉತ್ತರ - ಉತ್ತರಪಶ್ಚಿಮ"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "ಅಮಾನ್ಯ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "ಸ್ಪಚ್ಛವಾದ ಆಕಾಶ"
diff --git a/po/ko.po b/po/ko.po
index 399b718..6bf7cfa 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,373 +11,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/MATE/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Seoul"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "RKSL"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "37-34N 126-58E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "기본값"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "잘못됨"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "뷰포트 등급"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "기압"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "마일"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "그리니치 표준시"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com에서 레이더 지도를 가져올 3자리 숫자로 된 코드, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in 안에 들어 있습니다"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "도시의 구분되는 지역, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in 안에 들어 있습니다"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "데이터를 자동으로 업데이트합니다."
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "애플릿이 자동으로 날씨 통계를 업데이트할 지 여부를 결정합니다."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "레이더 지도 보기"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "거리 단위"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "업데이트 간격"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "업데이트할 때마다 레이더 지도 가져오기."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "자동 업데이트 시간 간격 (초)."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "참이면, \"radar\" 키에서 시정한 위치에서 레이더 지도를 가져옵니다."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "미터법 쓰기"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "위치의 위도와 경도는 DD-MM-SS[NS] DD-MM-SS[EW] 형태로 씁니다."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "미터법 쓰기 (설정하지 않으면 영국식)."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "위치 좌표"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "가까운 도시"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "거리 단위"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "더 이상 사용하지 않습니다"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "기압 단위"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "레이더 위치"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "속도 단위"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "기온 단위"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "날씨 정보를 표시할 도시."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "레이더 지도를 가져올 때 직접 설정한 URL을 사용합니다."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "더 이상 사용하지 않습니다"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "자동 업데이트 시간 간격 (초)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "레이더 지도 보기"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "기압에 사용할 단위."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "업데이트할 때마다 레이더 지도 가져오기."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "기온에 사용할 단위."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "시계에 사용할 단위."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "날씨 위치 정보"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "풍속에 사용할 단위."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "날씨 위치 정보."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "업데이트 간격"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "데이터를 자동으로 업데이트합니다."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "가까운 도시"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "레이더 지도의 URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "레이더 지도에 직접 설정한 URL 사용"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "미터법 쓰기"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "지역 위치"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "미터법 쓰기 (설정하지 않으면 영국식)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "레이더 위치"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "도시의 날씨"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "날씨 위치 정보"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "날씨 정보를 표시할 도시."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "날씨 위치 정보."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "지역 위치"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "위치 좌표"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "위치의 위도와 경도는 DD-MM-SS[NS] DD-MM-SS[EW] 형태로 씁니다."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "레이더 지도에 직접 설정한 URL 사용"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "참이면, \"radar\" 키에서 시정한 위치에서 레이더 지도를 가져옵니다."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "레이더 지도의 URL"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "레이더 지도를 가져올 때 직접 설정한 URL을 사용합니다."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -462,11 +451,6 @@ msgstr "북서"
 msgid "North - Northwest"
 msgstr "북북서"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "잘못됨"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "구름 한 점 없는 맑은 하늘"
diff --git a/po/ku.po b/po/ku.po
index 4c955f7..5198008 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Kurdish (http://www.transifex.com/projects/p/MATE/language/ku/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ku\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Amed"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LTCC"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "37-53N 040-11E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Standard"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nederbasdar"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/ç"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knot"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Pîvanga Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "kPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Agahiyan bixwebwe rojane bike"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Diyar dike ku bê ka sepanok îstatîskên rewşa hewê bixweber rojane dike yan na"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Nexşeya radarê nîşan bide"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Navbera rojanekirinê"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Yekeya Dûrbûnê"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Ji bo rojanekirinên bixweber, navbera,  ji cureyê çirkan."
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Çi gava ku rojane bibe nexşeya radarê bistîne."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Yekeyên metrîk bikar bîne"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Heke hilbijartî be, di mifteya \"radar\"ê de ji cihê ku hatiye diyarkirin nexşeya radarê distîne."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Dêvila yekeyên îngîlîzan yekeyên metrîk bikar bîne."
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordînatên bicihbûnê"
-
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Bajarê nêzîk"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Yekeya Dûrbûnê"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Êdî nayê bikaranîn"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Yekeya pestoyê"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Cihê radarê"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Yekeya lezê"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Yekeya germê"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "urlya taybet ya nexşeya radarê wê were stendin."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Êdî nayê bikaranîn"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Ji bo rojanekirinên bixweber, navbera,  ji cureyê çirkan."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Nexşeya radarê nîşan bide"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Yekeya pestoyê ya wê were bikaranîn."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Çi gava ku rojane bibe nexşeya radarê bistîne."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Yekeya germê ya wê were bikaranîn."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Yekeye qada xuyanîbûnê ya wê were bikaranîn"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Agahiyên bicihbûnê ya rewşa hewê"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Yekeye leza bê ya wê were bikaranîn"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Agahiyên bicihbûnê ya rewşa hewê"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Navbera rojanekirinê"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Agahiyan bixwebwe rojane bike"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Bajarê nêzîk"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Ji bo nexşeya radarê url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Ji bo nexşeya radarê navnîşana taybet bikar bîne"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Yekeyên metrîk bikar bîne"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Cihê herêmê"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Dêvila yekeyên îngîlîzan yekeyên metrîk bikar bîne."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Cihê radarê"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Heweya Barajî"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Agahiyên bicihbûnê ya rewşa hewê"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Agahiyên bicihbûnê ya rewşa hewê"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Cihê herêmê"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordînatên bicihbûnê"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Ji bo nexşeya radarê navnîşana taybet bikar bîne"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Heke hilbijartî be, di mifteya \"radar\"ê de ji cihê ku hatiye diyarkirin nexşeya radarê distîne."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Ji bo nexşeya radarê url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "urlya taybet ya nexşeya radarê wê were stendin."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Bakurê rojava"
 msgid "North - Northwest"
 msgstr "Bakur - bakurê Rojava"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nederbasdar"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ezmanê Sayî"
diff --git a/po/ky.po b/po/ky.po
index cfabc84..0f7c661 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -1,1832 +1,932 @@
-# mate-applets Kirghiz translation.
-# This file is distributed under the same license as the mate-applets package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Timur Jamakeev <[email protected]>, 2005.
-#
+#  <[email protected]>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-applets HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-26 21:39-0500\n"
-"PO-Revision-Date: 2005-12-27 09:26+0500\n"
-"Last-Translator: Timur Jamakeev <[email protected]>\n"
-"Language-Team: \n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-28 02:45+0000\n"
+"Last-Translator: chingis <[email protected]>\n"
+"Language-Team: Kirgyz (http://www.transifex.com/projects/p/MATE/language/ky/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#.
-#: ../libmateweather/mateweather-mateconf.c:163 ../libmateweather/mateweather-mateconf.c:164
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr ""
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://svn.gnome.org/viewvc/libmateweather/trunk/data/Locations.xml.in?view=markup
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#.
-#: ../libmateweather/mateweather-mateconf.c:183 ../libmateweather/mateweather-mateconf.c:184
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://svn.gnome.org/viewvc/libmateweather/trunk/data/Locations.xml.in?view=markup
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#.
-#: ../libmateweather/mateweather-mateconf.c:203 ../libmateweather/mateweather-mateconf.c:204
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://svn.gnome.org/viewvc/libmateweather/trunk/data/Locations.xml.in?view=markup
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#.
-#: ../libmateweather/mateweather-mateconf.c:224 ../libmateweather/mateweather-mateconf.c:225
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr ""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://svn.gnome.org/viewvc/libmateweather/trunk/data/Locations.xml.in?view=markup
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#.
-#: ../libmateweather/mateweather-mateconf.c:245 ../libmateweather/mateweather-mateconf.c:246
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
-
-#: ../libmateweather/mateweather-prefs.c:25 ../libmateweather/mateweather-prefs.c:36
-#: ../libmateweather/mateweather-prefs.c:51 ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr ""
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:27
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
-msgstr ""
+msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:29
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:31
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
+msgstr "F"
+
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
 msgstr ""
 
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
-msgstr ""
+msgstr "м/с"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
-msgstr ""
+msgstr "км/с"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:42
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
-msgstr ""
+msgstr "миля/с"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:44
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr ""
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:46
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
-msgstr ""
+msgstr "килопаскаль"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
-msgstr ""
+msgstr "миллибар"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:57
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr ""
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:59
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr ""
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:61
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr ""
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:63
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
-msgstr ""
+msgstr "атм"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
-msgstr ""
+msgstr "м"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
-msgstr ""
+msgstr "километр"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:74
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
-msgstr ""
+msgstr "миля"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:93 ../libmateweather/mateweather-prefs.c:102
-msgid "DEFAULT_TEMP_UNIT"
+#: ../libmateweather/mateweather-timezone.c:314
+msgid "Greenwich Mean Time"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:131 ../libmateweather/mateweather-prefs.c:141
-msgid "DEFAULT_SPEED_UNIT"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Маалыматтарды автоматтуу түрдө жаңылоо"
 
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:172 ../libmateweather/mateweather-prefs.c:183
-msgid "DEFAULT_PRESSURE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:212 ../libmateweather/mateweather-prefs.c:221
-msgid "DEFAULT_DISTANCE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://cvs.gnome.org/viewcvs/*checkout*/mate-applets/mateweather/"
-"Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from http://cvs.gnome.org/viewcvs/"
-"*checkout*/mate-applets/mateweather/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:8
-msgid ""
-"Determines whether the applet automatically updates its weather statistics "
-"or not."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
+msgstr "Аралык бирдиги"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the \"radar"
-"\" key."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS"
-"[EW]."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "Ылдамдык бирдиги"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Температура бирдиги"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from http://cvs.mate."
-"org/viewcvs/*checkout*/mate-applets/mateweather/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Жакын жердеги шаар"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Радар дареги"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
 msgstr ""
 
-#: ../libmateweather/weather-iwin.c:135 ../libmateweather/weather-metar.c:554
-#: ../libmateweather/weather-metar.c:582
-msgid "WeatherInfo missing location"
+#: ../libmateweather/timezone-menu.c:277
+msgctxt "timezone"
+msgid "Unknown"
+msgstr "Белгисиз"
+
+#. Translators: %d is an error code, and %s the error string
+#: ../libmateweather/weather-metar.c:504
+#, c-format
+msgid "Failed to get METAR data: %d %s.\n"
 msgstr ""
 
-#: ../libmateweather/weather-metar.c:527 ../libmateweather/weather-metar.c:562
-#: ../libmateweather/weather-wx.c:63
-msgid "Failed to get METAR data.\n"
+#: ../libmateweather/weather-metar.c:548
+msgid "WeatherInfo missing location"
 msgstr ""
 
-#: ../libmateweather/weather.c:180
+#: ../libmateweather/weather.c:232
 msgid "Variable"
-msgstr ""
+msgstr "Алмашма"
 
-#: ../libmateweather/weather.c:181
+#: ../libmateweather/weather.c:233
 msgid "North"
-msgstr ""
+msgstr "Түндүк"
 
-#: ../libmateweather/weather.c:181
+#: ../libmateweather/weather.c:233
 msgid "North - NorthEast"
-msgstr ""
+msgstr "Түндүк-түндүк-чыгыш"
 
-#: ../libmateweather/weather.c:181
+#: ../libmateweather/weather.c:233
 msgid "Northeast"
-msgstr ""
+msgstr "Түндүк-чыгыш"
 
-#: ../libmateweather/weather.c:181
+#: ../libmateweather/weather.c:233
 msgid "East - NorthEast"
-msgstr ""
+msgstr "Чыгыш-түндүк-чыгыш"
 
-#: ../libmateweather/weather.c:182
+#: ../libmateweather/weather.c:234
 msgid "East"
-msgstr ""
+msgstr "Чыгыш"
 
-#: ../libmateweather/weather.c:182
+#: ../libmateweather/weather.c:234
 msgid "East - Southeast"
-msgstr ""
+msgstr "Чыгыш-түштүк-чыгыш"
 
-#: ../libmateweather/weather.c:182
+#: ../libmateweather/weather.c:234
 msgid "Southeast"
-msgstr ""
+msgstr "Түштүк-чыгыш"
 
-#: ../libmateweather/weather.c:182
+#: ../libmateweather/weather.c:234
 msgid "South - Southeast"
-msgstr ""
+msgstr "Түштүк-түштүк-чыгыш"
 
-#: ../libmateweather/weather.c:183
+#: ../libmateweather/weather.c:235
 msgid "South"
-msgstr ""
+msgstr "Түштүк"
 
-#: ../libmateweather/weather.c:183
+#: ../libmateweather/weather.c:235
 msgid "South - Southwest"
-msgstr ""
+msgstr "Түштүк-түштүк-батыш"
 
-#: ../libmateweather/weather.c:183
+#: ../libmateweather/weather.c:235
 msgid "Southwest"
-msgstr ""
+msgstr "Түштүк-батыш"
 
-#: ../libmateweather/weather.c:183
+#: ../libmateweather/weather.c:235
 msgid "West - Southwest"
-msgstr ""
+msgstr "Батыш-түштүк-батыш"
 
-#: ../libmateweather/weather.c:184
+#: ../libmateweather/weather.c:236
 msgid "West"
-msgstr ""
+msgstr "Батыш"
 
-#: ../libmateweather/weather.c:184
+#: ../libmateweather/weather.c:236
 msgid "West - Northwest"
-msgstr ""
+msgstr "Батыш-түндүк-батыш"
 
-#: ../libmateweather/weather.c:184
+#: ../libmateweather/weather.c:236
 msgid "Northwest"
-msgstr ""
+msgstr "Түндүк-батыш"
 
-#: ../libmateweather/weather.c:184
+#: ../libmateweather/weather.c:236
 msgid "North - Northwest"
-msgstr ""
-
-#: ../libmateweather/weather.c:190 ../libmateweather/weather.c:690
-#: ../libmateweather/weather.c:739 ../libmateweather/weather.c:752
-#: ../libmateweather/weather.c:764 ../libmateweather/weather.c:779
-#: ../libmateweather/weather.c:795 ../libmateweather/weather.c:832
-#: ../libmateweather/weather.c:844 ../libmateweather/weather.c:863
-#: ../libmateweather/weather.c:895 ../libmateweather/weather.c:908
-#: ../libmateweather/weather.c:928
-msgid "Unknown"
-msgstr "Белгисиз"
+msgstr "Түндүк-түндүк-батыш"
 
-#: ../libmateweather/weather.c:192 ../libmateweather/weather.c:209
-#: ../libmateweather/weather.c:280
-msgid "Invalid"
-msgstr ""
-
-#: ../libmateweather/weather.c:198
+#: ../libmateweather/weather.c:249
 msgid "Clear Sky"
-msgstr ""
+msgstr "Ачык асман"
 
-#: ../libmateweather/weather.c:199
+#: ../libmateweather/weather.c:250
 msgid "Broken clouds"
 msgstr ""
 
-#: ../libmateweather/weather.c:200
+#: ../libmateweather/weather.c:251
 msgid "Scattered clouds"
 msgstr ""
 
-#: ../libmateweather/weather.c:201
+#: ../libmateweather/weather.c:252
 msgid "Few clouds"
 msgstr ""
 
-#: ../libmateweather/weather.c:202
+#: ../libmateweather/weather.c:253
 msgid "Overcast"
-msgstr ""
+msgstr "Жалпы булут каптагандык"
 
 #. TRANSLATOR: If you want to know what "blowing" "shallow" "partial"
 #. * etc means, you can go to http://www.weather.com/glossary/ and
-#. * http://www.crh.noaa.gov/arx/wx.tbl.html
+#. * http://www.crh.noaa.gov/arx/wx.tbl.php
 #. NONE
-#: ../libmateweather/weather.c:241 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:292 ../libmateweather/weather.c:294
 msgid "Thunderstorm"
-msgstr ""
+msgstr "Чагылгандуу жаан"
 
 #. DRIZZLE
-#: ../libmateweather/weather.c:242
+#: ../libmateweather/weather.c:293
 msgid "Drizzle"
-msgstr ""
+msgstr "Себээлеген жамгыр"
 
-#: ../libmateweather/weather.c:242
+#: ../libmateweather/weather.c:293
 msgid "Light drizzle"
 msgstr ""
 
-#: ../libmateweather/weather.c:242
+#: ../libmateweather/weather.c:293
 msgid "Moderate drizzle"
 msgstr ""
 
-#: ../libmateweather/weather.c:242
+#: ../libmateweather/weather.c:293
 msgid "Heavy drizzle"
 msgstr ""
 
-#: ../libmateweather/weather.c:242
+#: ../libmateweather/weather.c:293
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:294
 msgid "Rain"
-msgstr ""
+msgstr "Жаан"
 
-#: ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:294
 msgid "Light rain"
 msgstr ""
 
-#: ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:294
 msgid "Moderate rain"
 msgstr ""
 
-#: ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:294
 msgid "Heavy rain"
-msgstr ""
+msgstr "Катуу жаан"
 
-#: ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:294
 msgid "Rain showers"
-msgstr ""
+msgstr "Нөшөр жаан"
 
-#: ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:294
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Snow"
-msgstr ""
+msgstr "Кар"
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Light snow"
 msgstr ""
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Moderate snow"
 msgstr ""
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Heavy snow"
 msgstr ""
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Snowstorm"
 msgstr ""
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Blowing snowfall"
 msgstr ""
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Snow showers"
 msgstr ""
 
-#: ../libmateweather/weather.c:244
+#: ../libmateweather/weather.c:295
 msgid "Drifting snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: ../libmateweather/weather.c:245
+#: ../libmateweather/weather.c:296
 msgid "Snow grains"
 msgstr ""
 
-#: ../libmateweather/weather.c:245
+#: ../libmateweather/weather.c:296
 msgid "Light snow grains"
 msgstr ""
 
-#: ../libmateweather/weather.c:245
+#: ../libmateweather/weather.c:296
 msgid "Moderate snow grains"
 msgstr ""
 
-#: ../libmateweather/weather.c:245
+#: ../libmateweather/weather.c:296
 msgid "Heavy snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: ../libmateweather/weather.c:246
+#: ../libmateweather/weather.c:297
 msgid "Ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:298
 msgid "Ice pellets"
 msgstr ""
 
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:298
 msgid "Few ice pellets"
 msgstr ""
 
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:298
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:298
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:298
 msgid "Ice pellet storm"
 msgstr ""
 
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:298
 msgid "Showers of ice pellets"
 msgstr ""
 
 #. HAIL
-#: ../libmateweather/weather.c:248
+#: ../libmateweather/weather.c:299
 msgid "Hail"
-msgstr ""
+msgstr "Мөндүр"
 
-#: ../libmateweather/weather.c:248
+#: ../libmateweather/weather.c:299
 msgid "Hailstorm"
 msgstr ""
 
-#: ../libmateweather/weather.c:248
+#: ../libmateweather/weather.c:299
 msgid "Hail showers"
 msgstr ""
 
 #. SMALL_HAIL
-#: ../libmateweather/weather.c:249
+#: ../libmateweather/weather.c:300
 msgid "Small hail"
 msgstr ""
 
-#: ../libmateweather/weather.c:249
+#: ../libmateweather/weather.c:300
 msgid "Small hailstorm"
 msgstr ""
 
-#: ../libmateweather/weather.c:249
+#: ../libmateweather/weather.c:300
 msgid "Showers of small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: ../libmateweather/weather.c:250
+#: ../libmateweather/weather.c:301
 msgid "Unknown precipitation"
 msgstr ""
 
 #. MIST
-#: ../libmateweather/weather.c:251
+#: ../libmateweather/weather.c:302
 msgid "Mist"
 msgstr ""
 
 #. FOG
-#: ../libmateweather/weather.c:252
+#: ../libmateweather/weather.c:303
 msgid "Fog"
-msgstr ""
+msgstr "Туман"
 
-#: ../libmateweather/weather.c:252
+#: ../libmateweather/weather.c:303
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: ../libmateweather/weather.c:252
+#: ../libmateweather/weather.c:303
 msgid "Shallow fog"
 msgstr ""
 
-#: ../libmateweather/weather.c:252
+#: ../libmateweather/weather.c:303
 msgid "Patches of fog"
 msgstr ""
 
-#: ../libmateweather/weather.c:252
+#: ../libmateweather/weather.c:303
 msgid "Partial fog"
 msgstr ""
 
-#: ../libmateweather/weather.c:252
+#: ../libmateweather/weather.c:303
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: ../libmateweather/weather.c:253
+#: ../libmateweather/weather.c:304
 msgid "Smoke"
-msgstr ""
+msgstr "Түтүн"
 
 #. VOLCANIC_ASH
-#: ../libmateweather/weather.c:254
+#: ../libmateweather/weather.c:305
 msgid "Volcanic ash"
 msgstr ""
 
 #. SAND
-#: ../libmateweather/weather.c:255
+#: ../libmateweather/weather.c:306
 msgid "Sand"
 msgstr ""
 
-#: ../libmateweather/weather.c:255
+#: ../libmateweather/weather.c:306
 msgid "Blowing sand"
 msgstr ""
 
-#: ../libmateweather/weather.c:255
+#: ../libmateweather/weather.c:306
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: ../libmateweather/weather.c:256
+#: ../libmateweather/weather.c:307
 msgid "Haze"
 msgstr ""
 
 #. SPRAY
-#: ../libmateweather/weather.c:257
+#: ../libmateweather/weather.c:308
 msgid "Blowing sprays"
 msgstr ""
 
 #. DUST
-#: ../libmateweather/weather.c:258
+#: ../libmateweather/weather.c:309
 msgid "Dust"
 msgstr ""
 
-#: ../libmateweather/weather.c:258
+#: ../libmateweather/weather.c:309
 msgid "Blowing dust"
 msgstr ""
 
-#: ../libmateweather/weather.c:258
+#: ../libmateweather/weather.c:309
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: ../libmateweather/weather.c:259
+#: ../libmateweather/weather.c:310
 msgid "Squall"
 msgstr ""
 
 #. SANDSTORM
-#: ../libmateweather/weather.c:260
+#: ../libmateweather/weather.c:311
 msgid "Sandstorm"
 msgstr ""
 
-#: ../libmateweather/weather.c:260
+#: ../libmateweather/weather.c:311
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: ../libmateweather/weather.c:260
+#: ../libmateweather/weather.c:311
 msgid "Heavy sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: ../libmateweather/weather.c:261
+#: ../libmateweather/weather.c:312
 msgid "Duststorm"
 msgstr ""
 
-#: ../libmateweather/weather.c:261
+#: ../libmateweather/weather.c:312
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: ../libmateweather/weather.c:261
+#: ../libmateweather/weather.c:312
 msgid "Heavy duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: ../libmateweather/weather.c:262
+#: ../libmateweather/weather.c:313
 msgid "Funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: ../libmateweather/weather.c:263
+#: ../libmateweather/weather.c:314
 msgid "Tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: ../libmateweather/weather.c:264
+#: ../libmateweather/weather.c:315
 msgid "Dust whirls"
 msgstr ""
 
-#: ../libmateweather/weather.c:264
+#: ../libmateweather/weather.c:315
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
 #. TRANSLATOR: this is a format string for strftime
 #. *             see `man 3 strftime` for more details
-#.
-#: ../libmateweather/weather.c:662
+#. 
+#: ../libmateweather/weather.c:710
 msgid "%a, %b %d / %H:%M"
 msgstr ""
 
-#: ../libmateweather/weather.c:677
+#: ../libmateweather/weather.c:725
 msgid "Unknown observation time"
 msgstr ""
 
-#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\342\204\211 is the "DEGREE FAHRENHEIT" symbol)
-#: ../libmateweather/weather.c:710
+#: ../libmateweather/weather.c:739 ../libmateweather/weather.c:790
+#: ../libmateweather/weather.c:804 ../libmateweather/weather.c:817
+#: ../libmateweather/weather.c:830 ../libmateweather/weather.c:843
+#: ../libmateweather/weather.c:861 ../libmateweather/weather.c:879
+#: ../libmateweather/weather.c:917 ../libmateweather/weather.c:933
+#: ../libmateweather/weather.c:956 ../libmateweather/weather.c:988
+#: ../libmateweather/weather.c:1004 ../libmateweather/weather.c:1024
+msgid "Unknown"
+msgstr "Белгисиз"
+
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
+#. U+00B0 DEGREE SIGN)
+#: ../libmateweather/weather.c:761
 #, c-format
-msgid "%.1f ℉"
+msgid "%.1f °F"
 msgstr ""
 
-#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\342\204\211 is the "DEGREE FAHRENHEIT" symbol)
-#: ../libmateweather/weather.c:713
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
+#. U+00B0 DEGREE SIGN)
+#: ../libmateweather/weather.c:764
 #, c-format
-msgid "%d ℉"
+msgid "%d °F"
 msgstr ""
 
-#. TRANSLATOR: This is the temperature in degrees Celsius (\342\204\203 is the "DEGREE CELSIUS" symbol)
-#: ../libmateweather/weather.c:719
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
+#. DEGREE SIGN)
+#: ../libmateweather/weather.c:770
 #, c-format
-msgid "%.1f ℃"
+msgid "%.1f °C"
 msgstr ""
 
-#. TRANSLATOR: This is the temperature in degrees Celsius (\342\204\203 is the "DEGREE CELSIUS" symbol)
-#: ../libmateweather/weather.c:722
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
+#. DEGREE SIGN)
+#: ../libmateweather/weather.c:773
 #, c-format
-msgid "%d ℃"
+msgid "%d °C"
 msgstr ""
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libmateweather/weather.c:728
+#: ../libmateweather/weather.c:779
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libmateweather/weather.c:731
+#: ../libmateweather/weather.c:782
 #, c-format
 msgid "%d K"
 msgstr ""
 
 #. TRANSLATOR: This is the humidity in percent
-#: ../libmateweather/weather.c:782
+#: ../libmateweather/weather.c:864
 #, c-format
 msgid "%.f%%"
 msgstr ""
 
 #. TRANSLATOR: This is the wind speed in knots
-#: ../libmateweather/weather.c:807
+#: ../libmateweather/weather.c:892
 #, c-format
 msgid "%0.1f knots"
 msgstr ""
 
 #. TRANSLATOR: This is the wind speed in miles per hour
-#: ../libmateweather/weather.c:811
+#: ../libmateweather/weather.c:896
 #, c-format
 msgid "%.1f mph"
 msgstr ""
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
-#: ../libmateweather/weather.c:815
+#: ../libmateweather/weather.c:900
 #, c-format
 msgid "%.1f km/h"
-msgstr ""
+msgstr "%.1f км/с"
 
 #. TRANSLATOR: This is the wind speed in meters per second
-#: ../libmateweather/weather.c:819
+#: ../libmateweather/weather.c:904
 #, c-format
 msgid "%.1f m/s"
 msgstr ""
 
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
-#.
-#: ../libmateweather/weather.c:825
+#. 
+#: ../libmateweather/weather.c:910
 #, c-format
 msgid "Beaufort force %.1f"
 msgstr ""
 
-#: ../libmateweather/weather.c:846
+#: ../libmateweather/weather.c:935
 msgid "Calm"
 msgstr ""
 
 #. TRANSLATOR: This is 'wind direction' / 'wind speed'
-#: ../libmateweather/weather.c:850
+#: ../libmateweather/weather.c:939
 #, c-format
 msgid "%s / %s"
 msgstr ""
 
 #. TRANSLATOR: This is pressure in inches of mercury
-#: ../libmateweather/weather.c:868
+#: ../libmateweather/weather.c:961
 #, c-format
 msgid "%.2f inHg"
 msgstr ""
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
-#: ../libmateweather/weather.c:872
+#: ../libmateweather/weather.c:965
 #, c-format
 msgid "%.1f mmHg"
 msgstr ""
 
 #. TRANSLATOR: This is pressure in kiloPascals
-#: ../libmateweather/weather.c:876
+#: ../libmateweather/weather.c:969
 #, c-format
 msgid "%.2f kPa"
 msgstr ""
 
 #. TRANSLATOR: This is pressure in hectoPascals
-#: ../libmateweather/weather.c:880
+#: ../libmateweather/weather.c:973
 #, c-format
 msgid "%.2f hPa"
 msgstr ""
 
 #. TRANSLATOR: This is pressure in millibars
-#: ../libmateweather/weather.c:884
+#: ../libmateweather/weather.c:977
 #, c-format
 msgid "%.2f mb"
 msgstr ""
 
 #. TRANSLATOR: This is pressure in atmospheres
-#: ../libmateweather/weather.c:888
+#: ../libmateweather/weather.c:981
 #, c-format
 msgid "%.3f atm"
 msgstr ""
 
 #. TRANSLATOR: This is the visibility in miles
-#: ../libmateweather/weather.c:913
+#: ../libmateweather/weather.c:1009
 #, c-format
 msgid "%.1f miles"
 msgstr ""
 
 #. TRANSLATOR: This is the visibility in kilometers
-#: ../libmateweather/weather.c:917
+#: ../libmateweather/weather.c:1013
 #, c-format
 msgid "%.1f km"
 msgstr ""
 
 #. TRANSLATOR: This is the visibility in meters
-#: ../libmateweather/weather.c:921
+#: ../libmateweather/weather.c:1017
 #, c-format
 msgid "%.0fm"
 msgstr ""
 
-#: ../libmateweather/weather.c:949 ../libmateweather/weather.c:969
+#: ../libmateweather/weather.c:1046 ../libmateweather/weather.c:1067
 msgid "%H:%M"
 msgstr ""
 
-#: ../libmateweather/weather.c:1002
+#: ../libmateweather/weather.c:1126
 msgid "Retrieval failed"
 msgstr ""
-
-#~ msgid "_About"
-#~ msgstr "_Апплет жөнүндө"
-
-#~ msgid "_Help"
-#~ msgstr "_Жардам"
-
-#~ msgid "_Keyboard Accessibility Preferences"
-#~ msgstr "_Алиптергичтин атайын мүмкүнчүлүктөрүнүн ырастоолору"
-
-#~ msgid "AccessX Status Applet Factory"
-#~ msgstr "AccessX Status Апплет Фабрикасы"
-
-#~ msgid "Keyboard Accessibility Status"
-#~ msgstr "Алиптергич атайын мүмкүнчүлүктөр абалы"
-
-#~ msgid "Keyboard Accessibility Status Applet Factory"
-#~ msgstr "Алиптергич атайын мүмкүнчүлүктөр абалынын апплет фабрикасы"
-
-#~ msgid "Shows the status of keyboard accessibility features"
-#~ msgstr "Алиптергич атайын мүмкүнчүлүктөрүнүн абалын көрсөтөт"
-
-#~ msgid "AccessX Status"
-#~ msgstr "AccessX абалы"
-
-#~ msgid "Shows the state of AccessX features such as latched modifiers"
-#~ msgstr "AccessX мүмкүнчүлүктөрүнүн абалын көрсөтөт"
-
-#~ msgid "translator-credits"
-#~ msgstr "Тимур Жамакеев <[email protected]>"
-
-#~ msgid "There was an error launching the help viewer: %s"
-#~ msgstr ""
-#~ "Жардам чагылдыруу программасын иштетүү учурунда ката пайда болду: %s"
-
-#~ msgid "There was an error launching the keyboard preferences dialog: %s"
-#~ msgstr "Алиптергич ырастоо диалогун чыгаруу учурунда ката пайда болду: %s"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "Shows keyboard status when accessibility features are used."
-#~ msgstr "Атайын мүкүнчүлүктөр колдонулганда, алиптергич абалын көрсөтөт."
-
-#~ msgid "XKB Extension is not enabled"
-#~ msgstr "XKB кеңейүүсү иштетилген эмес"
-
-#~ msgid "Unknown error"
-#~ msgstr "Белгисиз ката"
-
-#~ msgid "Error: %s"
-#~ msgstr "Ката: %s"
-
-#~ msgid "Displays current state of keyboard accessibility features"
-#~ msgstr "Алиптергич атайын мүмкүнчүлүктөрүнүн учурдагы абалын көрсөтөт"
-
-#~ msgid "Battery Charge Monitor"
-#~ msgstr "Батарея абалынын индикатору"
-
-#~ msgid "Battstat Factory"
-#~ msgstr "Батарея абалы апплетинин фабрикасы"
-
-#~ msgid "Monitor a laptop's remaining power"
-#~ msgstr "Лэптоп батарея зарядынын абалын көрсөткүч"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Ырастоолор"
-
-#~ msgid "0 for no label, 1 for percentage and 2 for time remaining"
-#~ msgstr "0 - белгиси жок, 1 - процент жана 2 - калган убакыт"
-
-#~ msgid "Beep for warnings"
-#~ msgstr "Үн сигналы менен эскертүү"
-
-#~ msgid "Beep when displaying a warning"
-#~ msgstr "Эскертүүнү чагылдыруу учурунда үн менен коштоо"
-
-#~ msgid "Drain from top"
-#~ msgstr "Жогору жагынан кичирейет"
-
-#~ msgid "Full Battery Notification"
-#~ msgstr "Заряддын толуктугун билдирүү"
-
-#~ msgid "Low Battery Notification"
-#~ msgstr "Заряддын аздыгын билдирүү"
-
-#~ msgid "Notify user when the battery is full"
-#~ msgstr "Заряд толук кезде колдонуучуларды билдирүү"
-
-#~ msgid "Notify user when the battery is low"
-#~ msgstr "Заряд азайган кезде колдонуучуларды билдирүү"
-
-#~ msgid "Red value level"
-#~ msgstr "Кызыл түстүн деңгээли"
-
-#~ msgid ""
-#~ "Show the battery meter draining from the top of the battery. Only "
-#~ "implemented for traditional battery view."
-#~ msgstr ""
-#~ "Батарея заряды азайганда индикатор жогорудан төмөн түшөт. Салттуу батарея "
-#~ "түрүндө гана ишке ашырылган."
-
-#~ msgid "Show the horizontal battery"
-#~ msgstr "Горизонталдык батареяны көрсөтүү"
-
-#~ msgid "Show the time/percent label"
-#~ msgstr "Убакыт/процент белгисин чагылдыруу"
-
-#~ msgid "Show the traditional, horizontal battery on the panel"
-#~ msgstr "Панелде салттуу, горизонталдык батареяны чагылдыруу"
-
-#~ msgid "Show the upright, smaller battery on the panel"
-#~ msgstr "Панелде кичинекей вертикалдык батареяны чагылдыруу"
-
-#~ msgid ""
-#~ "The battery level below which the battery is displayed as red. Also the "
-#~ "value at which the low battery warning is displayed."
-#~ msgstr ""
-#~ "Бул мааниден азайган учурда кызыл түс менен чагылдырылуучу батарея "
-#~ "деңгээли. Ошондой эле, батарея зарядынын деңгээли төмөн жөнүндөгү "
-#~ "эскертүү берүү мааниси."
-
-#~ msgid "Upright (small) battery"
-#~ msgstr "Вертикалдык (кичинекей) батарея"
-
-#~ msgid ""
-#~ "Use the value defined in red_value as a time remaining to show the "
-#~ "warning dialog rather than a percentage"
-#~ msgstr ""
-#~ "red_value менен аныкталган маанини процент ордуна, эскертүүнү "
-#~ "чагылдырууга калган убакыт мааниси катары колдонуу."
-
-#~ msgid "Warn on low time rather than low percentage"
-#~ msgstr "Аз калган процент эмес, аз калган убакыт жөнүндө эскертүү"
-
-#~ msgid "System is running on AC power"
-#~ msgstr "Система өзгөрүлмө ток менен иштеп жатат"
-
-#~ msgid "System is running on battery power"
-#~ msgstr "Система батареядан иштеп жатат"
-
-#~ msgid "Battery charged (%d%%)"
-#~ msgstr "Батарея заряддалганы (%d%%)"
-
-#~ msgid "Unknown time (%d%%) remaining"
-#~ msgstr "Калган убакыт (%d%%) белгисиз"
-
-#~ msgid "Unknown time (%d%%) until charged"
-#~ msgstr "Толук заряд алууга калган убакыт (%d%%) белгисиз"
-
-#~ msgid "%d minute (%d%%) remaining"
-#~ msgid_plural "%d minutes (%d%%) remaining"
-#~ msgstr[0] "%d мүнөт (%d%%) калды"
-#~ msgstr[1] ""
-
-#~ msgid "%d minute until charged (%d%%)"
-#~ msgid_plural "%d minutes until charged (%d%%)"
-#~ msgstr[0] "%d мүнөт, заряддын толуусуна (%d%%)"
-#~ msgstr[1] ""
-
-#~ msgid "%d hour (%d%%) remaining"
-#~ msgid_plural "%d hours (%d%%) remaining"
-#~ msgstr[0] "%d саат (%d%%) калды"
-#~ msgstr[1] ""
-
-#~ msgid "%d hour until charged (%d%%)"
-#~ msgid_plural "%d hours until charged (%d%%)"
-#~ msgstr[0] "%d саат, заряддын толушуна (%d%%)"
-#~ msgstr[1] ""
-
-#~ msgid "%d %s %d %s (%d%%) remaining"
-#~ msgstr "%d %s %d %s (%d%%) калды"
-
-#~ msgid "hour"
-#~ msgid_plural "hours"
-#~ msgstr[0] "саат"
-#~ msgstr[1] ""
-
-#~ msgid "minute"
-#~ msgid_plural "minutes"
-#~ msgstr[0] "мүнөт"
-#~ msgstr[1] ""
-
-#~ msgid "%d %s %d %s until charged (%d%%)"
-#~ msgstr "%d %s %d %s заряд толушуна (%d%%)"
-
-#~ msgid "Battery Monitor"
-#~ msgstr "Батарея Индикатору"
-
-#~ msgid "Your battery is now fully recharged"
-#~ msgstr "Батареяңыз толук заряддалды"
-
-#~ msgid "Battery Notice"
-#~ msgstr "Батареядан билдирүү"
-
-#~ msgid ""
-#~ "You have %d minute of battery power remaining (%d%% of the total "
-#~ "capacity)."
-#~ msgid_plural ""
-#~ "You have %d minutes of battery power remaining (%d%% of the total "
-#~ "capacity)."
-#~ msgstr[0] ""
-#~ "Батарея менен иштөөгө калган убакыт %d мүнөт  (бардык сыйымдуулугунун %d%"
-#~ "%)."
-#~ msgstr[1] ""
-
-#~ msgid ""
-#~ "To avoid losing your work:\n"
-#~ " • plug your laptop into external power, or\n"
-#~ " • save open documents and shut your laptop down."
-#~ msgstr ""
-#~ "Жасаган ишиңизди жоготуп алуудан алдына алуу үчүн:\n"
-#~ " • лэптобуңузду тышкы ток булагына туташтырыңыз, же\n"
-#~ " • ачылган документтериңизди сактап лэптобуңузду өчүрүңүз."
-
-#~ msgid ""
-#~ "To avoid losing your work:\n"
-#~ " • suspend your laptop to save power,\n"
-#~ " • plug your laptop into external power, or\n"
-#~ " • save open documents and shut your laptop down."
-#~ msgstr ""
-#~ "Жасаган ишиңизди жоготуп алуудан алдына алуу үчүн:\n"
-#~ " • зарядды сактоо үчүн лэптопту токтото туруңуз,\n"
-#~ " • лэптобуңузду тышкы ток булагына туташтырыңыз, же\n"
-#~ " • ачылган документтериңизди сактап лэптобуңузду өчүрүңүз."
-
-#~ msgid "Your battery is running low"
-#~ msgstr "Батарея заряды түгөндү"
-
-#~ msgid "No battery present"
-#~ msgstr "Батарея жок"
-
-#~ msgid "Battery status unknown"
-#~ msgstr "Батарея абалы белгисиз"
-
-#~ msgid "N/A"
-#~ msgstr "М/Э"
-
-#~ msgid "There was an error displaying help: %s"
-#~ msgstr "Жардамды чагылдыруу учурундагы ката: %s"
-
-#~ msgid "This utility shows the status of your laptop battery."
-#~ msgstr "Бул утилита сиздин лэптобуңуздун батареясынын абалын көрсөтөт."
-
-#~ msgid "<b>Appearance</b>"
-#~ msgstr "<b>Сырткы көрүнүшү</b>"
-
-#~ msgid "<b>Notifications</b>"
-#~ msgstr "<b>Билдирүүлөр</b>"
-
-#~ msgid "<small>(shows single image for status and charge)</small>"
-#~ msgstr "<small>(абал жана заряд үчүн бир эле сүрөттөлүш көрсөтүлөт)</small>"
-
-#~ msgid "<small>(two images: one for status, one for charge)</small>"
-#~ msgstr "<small>(эки сүрөоттөлүш: бири абалы үчүн, бири заряд үчүн )</small>"
-
-#~ msgid "Battery Charge Monitor Preferences"
-#~ msgstr "Батарея зарядынын индикаторунун параметрлери"
-
-#~ msgid "Show _percentage remaining"
-#~ msgstr "Калган _процентти көрсөтүү"
-
-#~ msgid "Show _time remaining"
-#~ msgstr "Калган _убакытты көрсөтүү"
-
-#~ msgid "_Compact view"
-#~ msgstr "_Компактуу көрүнүш"
-
-#~ msgid "_Expanded view"
-#~ msgstr "К_еңири көрүнүш"
-
-#~ msgid "_Notify when battery is fully recharged"
-#~ msgstr "Батарея заряды _толгон учурда билдирүү жасоо"
-
-#~ msgid "_Show time/percentage:"
-#~ msgstr "Калган убакыт/процентти _көрсөтүү:"
-
-#~ msgid "Percent"
-#~ msgstr "Процент"
-
-#~ msgid "Minutes Remaining"
-#~ msgstr "Калган мүнөт"
-
-#~ msgid "Battery Status Utility"
-#~ msgstr "Батарея Абалы Индикатору"
-
-#~ msgid "Battery fully re-charged"
-#~ msgstr "Батарея толук заряддалды"
-
-#~ msgid "Battery power low"
-#~ msgstr "Батарея заряды толук түгөндү"
-
-#~ msgid "Character Palette"
-#~ msgstr "Символдор палитрасы"
-
-#~ msgid "Charpicker Applet Factory"
-#~ msgstr "Charpicker Апплет Фабрикасы"
-
-#~ msgid "Insert characters"
-#~ msgstr "Апплет атайын символдорду терүүгө жардам берет"
-
-#~ msgid "Available palettes"
-#~ msgstr "Мүмкүн болгон палитралар"
-
-#~ msgid "Insert \"%s\""
-#~ msgstr "\"%s\" кыстаруу"
-
-#~ msgid "Insert special character"
-#~ msgstr "Атайын символду кыстаруу"
-
-#~ msgid "insert special character %s"
-#~ msgstr "%s атайын символун кыстаруу"
-
-#~ msgid ""
-#~ "Mate Panel applet for selecting strange characters that are not on my "
-#~ "keyboard. Released under GNU General Public Licence."
-#~ msgstr ""
-#~ "Алиптергичте жок атайын символдорду терүүчү апплет. GNU General Public "
-#~ "Licence лицензиясынын негизинде чыгарылган."
-
-#~ msgid "Characters shown on applet startup"
-#~ msgstr "Апплетти иштеткен учурда көрсөтүлүүчү символдор"
-
-#~ msgid "DEPRECATED - Characters shown on applet startup"
-#~ msgstr "СУНУШТАЛБАЙТ - Апплетти иштеткен учурда көрсөтүлүүчү символдор"
-
-#~ msgid "List of available palettes"
-#~ msgstr "Мүмкүн болгон палитралар тизмеси"
-
-#~ msgid "List of strings containing the available palettes"
-#~ msgstr "Мүмкүн болгон палитраларды камтыган саптардын тизмеси"
-
-#~ msgid "_Edit"
-#~ msgstr "_Оңдоо"
-
-#~ msgid "_Palette:"
-#~ msgstr "_Палитра:"
-
-#~ msgid "Palette entry"
-#~ msgstr "Палитра элементи"
-
-#~ msgid "Modify a palette by adding or removing characters"
-#~ msgstr "Символдорду кошуу же алып салуу менен палитраны өзгөртүңүз"
-
-#~ msgid "Add Palette"
-#~ msgstr "Палитра кошуу"
-
-#~ msgid "Edit Palette"
-#~ msgstr "Палитраны оңдоо"
-
-#~ msgid "Palettes list"
-#~ msgstr "Палитралар тизмеси"
-
-#~ msgid "_Palettes:"
-#~ msgstr "_Палитралар:"
-
-#~ msgid "Add button"
-#~ msgstr "Баскыч кошуу"
-
-#~ msgid "Click to add a new palette"
-#~ msgstr "Жаңы палитра кошуу үчүн чертиңиз"
-
-#~ msgid "Edit button"
-#~ msgstr "Баскычты оңдоо"
-
-#~ msgid "Click to edit the selected palette"
-#~ msgstr "Тандалган палитраны оңдоо үчүн чертиңиз"
-
-#~ msgid "Delete button"
-#~ msgstr "Баскычты жоготуу"
-
-#~ msgid "Click to delete the selected palette"
-#~ msgstr "тандалган палитраны жоготуу үчүн чертиңиз"
-
-#~ msgid "Character Palette Preferences"
-#~ msgstr "Символдор палитрасынын параметрлери"
-
-#~ msgid "CPU Frequency Scaling Monitor"
-#~ msgstr "Процессордун жыштыгынын өзгөрүүсүнүн монитору"
-
-#~ msgid "Monitor the CPU Frequency Scaling"
-#~ msgstr "Процессордун жыштыгынын өзгөрүүсүн байкайт"
-
-#~ msgid ""
-#~ "A 0 value means to show cpu frequency, 1 to show frequency and units, and "
-#~ "2 to show percentage instead of frequency."
-#~ msgstr ""
-#~ "0 - БП жыштыгын көрсөтүү, 1 - жыштыгын жана бирдигин көрсөтүү, жана 2 - "
-#~ "жыштыктын ордуна процентин көрсөтүү."
-
-#~ msgid "CPU to Monitor"
-#~ msgstr "Байкалуучу процессор"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b>Display Settings</b>"
-#~ msgstr "<b>Чагылдыруу параметрлери</b>"
-
-#~ msgid "<b>Frequency Selector</b>"
-#~ msgstr "<b>Жыштык тандоо</b>"
-
-#~ msgid "<b>Monitor Settings</b>"
-#~ msgstr "<b>Монитор параметрлери</b>"
-
-#~ msgid "Graphic"
-#~ msgstr "График"
-
-#~ msgid "Text"
-#~ msgstr "Текст"
-
-#~ msgid "Graphic and Text"
-#~ msgstr "График жана Текст"
-
-#~ msgid "Frequencies"
-#~ msgstr "Жыштыктар"
-
-#~ msgid "Governors"
-#~ msgstr "Регуляторлор"
-
-#~ msgid "Frequencies and Governors"
-#~ msgstr "Жыштыктар жана регуляторлор"
-
-#~ msgid "Disk Mounter"
-#~ msgstr "Диск бириктирүү"
-
-#~ msgid "Drive Mount Applet Factory"
-#~ msgstr "Диск бириктирүү апплетинин фабрикасы"
-
-#~ msgid "Factory for drive mount applet"
-#~ msgstr "Диск бириктирүү апплети үчүн фабрика"
-
-#~ msgid "Mount local disks and devices"
-#~ msgstr "Локалдык дисктерди жана түзүлүштөрдү бириктирүү"
-
-#~ msgid "(mounted)"
-#~ msgstr "(бириктирилген)"
-
-#~ msgid "(not mounted)"
-#~ msgstr "(бириктирилген эмес)"
-
-#~ msgid "(not connected)"
-#~ msgstr "(байланышкан эмес)"
-
-#~ msgid "Cannot execute '%s'"
-#~ msgstr "'%s' аткарууга болдобу"
-
-#~ msgid "Mount Error"
-#~ msgstr "Бириктирүү катасы"
-
-#~ msgid "Unmount Error"
-#~ msgstr "Ажыратуу катасы"
-
-#~ msgid "Eject Error"
-#~ msgstr "Бошотуу катасы"
-
-#~ msgid "Error"
-#~ msgstr "Ката"
-
-#~ msgid "_Play DVD"
-#~ msgstr "DVD _ойнотуу"
-
-#~ msgid "_Play CD"
-#~ msgstr "CD _ойнотуу"
-
-#~ msgid "_Open %s"
-#~ msgstr "_Ачуу: %s"
-
-#~ msgid "_Mount %s"
-#~ msgstr "_Бириктирүү: %s"
-
-#~ msgid "Un_mount %s"
-#~ msgstr "_Ажыратуу %s"
-
-#~ msgid "_Eject %s"
-#~ msgstr "_Бошотуу %s"
-
-#~ msgid "Applet for mounting and unmounting block volumes."
-#~ msgstr "Блоктук томдорду бириктирүү жана ажыратуу үчүн апплет"
-
-#~ msgid "Interval timeout to check mount point status"
-#~ msgstr "Бириктирүү чекитин текшерүү үчүн таймер убакыты"
-
-#~ msgid "Time in seconds between status updates"
-#~ msgstr "Абалды жаңылоо ортосундагы убакыт секунд менен"
-
-#~ msgid "Themes"
-#~ msgstr "Темалар"
-
-#~ msgid "_Select a theme:"
-#~ msgstr "_Тема тандоо:"
-
-#~ msgid "Arabic keymap"
-#~ msgstr "Араб алипкартасы"
-
-#~ msgid "Armenian"
-#~ msgstr "Армян"
-
-#~ msgid "Basque"
-#~ msgstr "Баск"
-
-#~ msgid "Belgian"
-#~ msgstr "Бельгия"
-
-#~ msgid "Brazil Portuguese keymap"
-#~ msgstr "Бразилиялык Португалия алипкартасы"
-
-#~ msgid "Bulgarian Cyrillic"
-#~ msgstr "Болгария кириллицасы"
-
-#~ msgid "Bulgarian keymap"
-#~ msgstr "Болгария алипкартасы"
-
-#~ msgid "Czech keymap"
-#~ msgstr "Чех алипкартасы"
-
-#~ msgid "Danish keymap"
-#~ msgstr "Дания алипкартасы"
-
-#~ msgid "Dutch keymap"
-#~ msgstr "Голландия алипкартасы"
-
-#~ msgid "English keymap"
-#~ msgstr "Англис алипкартасы"
-
-#~ msgid "Estonian keymap"
-#~ msgstr "Эстония алипкартасы"
-
-#~ msgid "Finnish keymap"
-#~ msgstr "Фин алипкартасы"
-
-#~ msgid "French Swiss"
-#~ msgstr "Швейцариялык француз тили"
-
-#~ msgid "French Swiss keymap"
-#~ msgstr "Француз алипкартасы (Швейцария үчүн)"
-
-#~ msgid "French keymap"
-#~ msgstr "Француз алипкартасы"
-
-#~ msgid "French-Canadian 105-key"
-#~ msgstr "Канадалык-Француз 105-тергич"
-
-#~ msgid "GB 102-key"
-#~ msgstr "GB 102-тергич"
-
-#~ msgid "GB 105-key"
-#~ msgstr "GB 105-тергич"
-
-#~ msgid "Generic Keyboard"
-#~ msgstr "Стандарттык алиптергич"
-
-#~ msgid "Georgian Latin"
-#~ msgstr "Грузин латынча"
-
-#~ msgid "Georgian Russian layout"
-#~ msgstr "Грузин орусча "
-
-#~ msgid "Georgian keymap"
-#~ msgstr "Грузин алипкартасы"
-
-#~ msgid "German"
-#~ msgstr "Немис"
-
-#~ msgid "German Swiss with Euro"
-#~ msgstr "Немисче эвросу менен (Швейцария үчүн)"
-
-#~ msgid "German keymap"
-#~ msgstr "Немис алипкартасы"
-
-#~ msgid "Greek keymap"
-#~ msgstr "Грек алипкартасы"
-
-#~ msgid "Hebrew keymap"
-#~ msgstr "Иврит алипкартасы"
-
-#~ msgid "Hungarian 101-key latin 1"
-#~ msgstr "Венгер 101-тергичтүү latin 1"
-
-#~ msgid "Hungarian 101-key latin 2"
-#~ msgstr "Венгер 101-тергичтүү latin 2"
-
-#~ msgid "Hungarian 105-key latin 1"
-#~ msgstr "Венгер 105-тергичтүү latin 1"
-
-#~ msgid "Hungarian 105-key latin 2"
-#~ msgstr "Венгер 105-тергичтүү latin 2"
-
-#~ msgid "Hungarian PC/AT 101 keyboard"
-#~ msgstr "Венгер PC/AT 101 алиптергич"
-
-#~ msgid "Hungarian latin1"
-#~ msgstr "Венгер latin1"
-
-#~ msgid "Icelandic keymap"
-#~ msgstr "Исландия алипкартасы"
-
-#~ msgid "Italian keymap"
-#~ msgstr "Италия алипкартасы"
-
-#~ msgid "Japanese keymap"
-#~ msgstr "Япон алипкартасы"
-
-#~ msgid "Lao keymap"
-#~ msgstr "Лаос алипкартасы"
-
-#~ msgid "Lithuanian keymap"
-#~ msgstr "Литва алипкартасы"
-
-#~ msgid "Macedonian"
-#~ msgstr "Македония"
-
-#~ msgid "Mongolian alt keymap"
-#~ msgstr "Монгол алт алипкартасы"
-
-#~ msgid "Mongolian keymap"
-#~ msgstr "Монгол алипкартасы"
-
-#~ msgid "Mongolian phonetic keymap"
-#~ msgstr "Монгол фонетикалык алипкартасы"
-
-#~ msgid "Norwegian"
-#~ msgstr "Норвегия"
-
-#~ msgid "Plain Russian keymap"
-#~ msgstr "Орус алипкартасы"
-
-#~ msgid "Polish"
-#~ msgstr "Польша"
-
-#~ msgid "Polish deadkeys"
-#~ msgstr "Польша эскирген символдор"
-
-#~ msgid "Portugal"
-#~ msgstr "Португалия"
-
-#~ msgid "Portugal Deadkeys"
-#~ msgstr "Португалия эскирген символдор"
-
-#~ msgid "Portuguese keymap"
-#~ msgstr "Португалия алипкартасы"
-
-#~ msgid "Russian Cyrillic"
-#~ msgstr "Орус кириллицасы"
-
-#~ msgid "Russian keymap"
-#~ msgstr "Орус аипкартасы"
-
-#~ msgid "Serbian keymap"
-#~ msgstr "Серб алипкартасы"
-
-#~ msgid "Slovak keymap"
-#~ msgstr "Словак алипкартасы"
-
-#~ msgid "Slovenian"
-#~ msgstr "Словения"
-
-#~ msgid "Slovenian keymap"
-#~ msgstr "Словен алипкартасы"
-
-#~ msgid "Spanish keymap"
-#~ msgstr "Испан алипкартасы"
-
-#~ msgid "Swedish"
-#~ msgstr "Швед"
-
-#~ msgid "Swedish keymap"
-#~ msgstr "Швед алипкартасы"
-
-#~ msgid "Swiss keymap"
-#~ msgstr "Швейцария алипкартасы"
-
-#~ msgid "Thai"
-#~ msgstr "Тай"
-
-#~ msgid "Thai Kedmanee"
-#~ msgstr "Тай, кидмандык"
-
-#~ msgid "Thai keymap"
-#~ msgstr "Тай алипкартасы"
-
-#~ msgid "Turkish \"F\" keyboard"
-#~ msgstr "Түрк \"F\" алиптактасы"
-
-#~ msgid "Turkish \"Q\" keyboard"
-#~ msgstr "Түрк \"Q\" алиптактасы"
-
-#~ msgid "Turkish keymap"
-#~ msgstr "Түрк алипкартасы"
-
-#~ msgid "UK 105-key"
-#~ msgstr "UK 105-тергич"
-
-#~ msgid "UK PC/AT keyboard"
-#~ msgstr "UK PC/AT алиптакта"
-
-#~ msgid "US 101-key keyboard"
-#~ msgstr "US 101-тергичтүү алиптакта"
-
-#~ msgid "US 105-key keyboard (with windows keys)"
-#~ msgstr "US 105-тергичтүү алиптакта (windows тергичи менен)"
-
-#~ msgid "US 84-key"
-#~ msgstr "US 84-тергичтүү"
-
-#~ msgid "US DEC 450"
-#~ msgstr "US DEC 450"
-
-#~ msgid "US IBM RS/6000"
-#~ msgstr "US IBM RS/6000"
-
-#~ msgid "US International"
-#~ msgstr "US Эл аралык"
-
-#~ msgid "US Macintosh"
-#~ msgstr "US Macintosh"
-
-#~ msgid "US PC/AT 101 keyboard"
-#~ msgstr "US PC/AT 101 алиптакта"
-
-#~ msgid "US Silicon Graphics 101-key"
-#~ msgstr "US Silicon Graphics 101-теригичтүү"
-
-#~ msgid "US Sun type5"
-#~ msgstr "US Sun type5"
-
-#~ msgid "Armenian Sun keymap"
-#~ msgstr "Армениялык Sun алипкартасы"
-
-#~ msgid "Azerbaijani Turkish Sun keymap"
-#~ msgstr "Азербайжан Түрк Sun алипкартасы"
-
-#~ msgid "Belarusian Sun keymap"
-#~ msgstr "Белорус Sun алипкартасы"
-
-#~ msgid "Brazil Portuguese Sun USB keymap"
-#~ msgstr "Бразилиялык потугал Sun USB алипкартасы"
-
-#~ msgid "Brazil Portuguese Sun keymap"
-#~ msgstr "Бразилиялык португал  Sun алипкартасы"
-
-#~ msgid "British Sun Type-4 keymap"
-#~ msgstr "Британиялык Sun Type-4 алипкартасы"
-
-#~ msgid "British Sun USB keymap"
-#~ msgstr "Британиялык Sun USB алипкартасы"
-
-#~ msgid "British Sun keymap"
-#~ msgstr "Британиялык Sun алипкартасы"
-
-#~ msgid "Bulgarian Sun keymap"
-#~ msgstr "Болгариялык Sun алипкартасы"
-
-#~ msgid "Canadian Sun keymap"
-#~ msgstr "Канадалык Sun алипкартасы"
-
-#~ msgid "Czech Sun keymap"
-#~ msgstr "Чех Sun алипкартасы"
-
-#~ msgid "Danish Sun Type-4 keymap"
-#~ msgstr "Даниялык Sun Type-4 алипкартасы"
-
-#~ msgid "Danish Sun USB keymap"
-#~ msgstr "Даниялык Sun USB алипкартасы"
-
-#~ msgid "Danish Sun keymap"
-#~ msgstr "Даниялык Sun алипкартасы"
-
-#~ msgid "Dutch Sun keymap"
-#~ msgstr "Голландиялык Sun алипкартасы"
-
-#~ msgid "Estonian Sun keymap"
-#~ msgstr "Эстонялык Sun алипкартасы"
-
-#~ msgid "Finnish Sun keymap"
-#~ msgstr "Фин Sun алипкартасы"
-
-#~ msgid "French Sun USB keymap"
-#~ msgstr "Француз Sun USB алипкартасы"
-
-#~ msgid "French Sun keymap"
-#~ msgstr "Француз Sun алипкартасы"
-
-#~ msgid "German Sun Type-4 keymap"
-#~ msgstr "Немис Sun Type-4 алипкартасы"
-
-#~ msgid "German Sun USB keymap"
-#~ msgstr "Немис Sun USB алипкартасы"
-
-#~ msgid "German Sun keymap"
-#~ msgstr "Немис Sun алипкартасы"
-
-#~ msgid "Hebrew Sun keymap"
-#~ msgstr "Иврит Sun алипкартасы"
-
-#~ msgid "Hungarian latin2 Sun keymap"
-#~ msgstr "Венгер latin2 Sun алипкартасы"
-
-#~ msgid "Hungarian type5 latin 1 keymap"
-#~ msgstr "Венгер type5 latin 1 алипкартасы"
-
-#~ msgid "Icelandic Sun keymap"
-#~ msgstr "Исландиялык Sun алипкартасы"
-
-#~ msgid "Italian Sun Type-4 keymap"
-#~ msgstr "Италиялык Sun Type-4 алипкартасы"
-
-#~ msgid "Italian Sun USB keymap"
-#~ msgstr "Италиялык Sun USB алипкартасы"
-
-#~ msgid "Italian Sun keymap"
-#~ msgstr "Италиялык Sun алипкартасы"
-
-#~ msgid "Japanese Sun Type-4 keymap"
-#~ msgstr "Япон Sun Type-4 алипкартасы"
-
-#~ msgid "Japanese Sun keymap"
-#~ msgstr "Япон Sun алипкартасы"
-
-#~ msgid "Latvian Sun keymap"
-#~ msgstr "Латвиялык Sun алипкартасы"
-
-#~ msgid "Lithuanian Sun keymap"
-#~ msgstr "Литвалык Sun алипкартасы"
-
-#~ msgid "Macedonian Sun keymap"
-#~ msgstr "Македониялык Sun алипкартасы"
-
-#~ msgid "Norwegian Sun keymap"
-#~ msgstr "Норвегия Sun алипкартасы"
-
-#~ msgid "Polish Sun keymap"
-#~ msgstr "Польша Sun алипкартасы"
-
-#~ msgid "Portuguese Sun Type-4 keymap"
-#~ msgstr "Португал Sun Type-4 алипкартасы"
-
-#~ msgid "Portuguese Sun keymap"
-#~ msgstr "Португал Sun алипкартасы"
-
-#~ msgid "Romanian Sun keymap"
-#~ msgstr "Румын Sun алипкартасы"
-
-#~ msgid "Russian Sun keymap"
-#~ msgstr "Орус Sun алипкартасы"
-
-#~ msgid "Serbian Sun standard keymap"
-#~ msgstr "Серб Sun стандарттык алипкарта"
-
-#~ msgid "Slovak Sun keymap"
-#~ msgstr "Словак Sun алипкартасы"
-
-#~ msgid "Slovenian Sun keymap"
-#~ msgstr "Словен Sun алипкартасы"
-
-#~ msgid "Spanish Sun Type-4 keymap"
-#~ msgstr "Испан Sun Type-4 алипкартасы"
-
-#~ msgid "Spanish Sun USB keymap"
-#~ msgstr "Испан Sun USB алипкартасы"
-
-#~ msgid "Spanish Sun keymap"
-#~ msgstr "Испан Sun алипкартасы"
-
-#~ msgid "Swedish Sun Type-4 keymap"
-#~ msgstr "Швед Sun Type-4 алипкартасы"
-
-#~ msgid "Swedish Sun USB keymap"
-#~ msgstr "Швед Sun USB алипкартасы"
-
-#~ msgid "Swedish Sun keymap"
-#~ msgstr "Швед Sun алипкартасы"
-
-#~ msgid "Swiss German Sun keymap"
-#~ msgstr "Швйцариялык немис Sun алипкартасы"
-
-#~ msgid "Thai Sun keymap"
-#~ msgstr "Тай Sun алипкартасы"
-
-#~ msgid "Turkish Sun keymap"
-#~ msgstr "Түрк Sun алипкартасы"
-
-#~ msgid "US Sun Type-4 keymap"
-#~ msgstr "US Sun Type-4 алипкартасы"
-
-#~ msgid "US Sun USB keymap"
-#~ msgstr "US Sun USB алипкартасы"
-
-#~ msgid "US Sun type5 keymap"
-#~ msgstr "US Sun type5 алипкартасы"
-
-#~ msgid "Ukrainian Sun keymap"
-#~ msgstr "Украин Sun алипкартасы"
-
-#~ msgid "Vietnamese Sun keymap"
-#~ msgstr "Въетнам Sun алипкартасы"
-
-#~ msgid "_Groups"
-#~ msgstr "_Группалар"
-
-#~ msgid "XKB initialization error"
-#~ msgstr "XKB инициализация катасы"
-
-#~ msgid "Close the dialog"
-#~ msgstr "Диалогду жабуу"
-
-#~ msgid "_Update"
-#~ msgstr "_Жаңылоо"
-
-#~ msgid "Updating..."
-#~ msgstr "Жаңылоо..."
diff --git a/po/lt.po b/po/lt.po
index 3195e12..0717756 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,373 +11,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/projects/p/MATE/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Vilnius"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EYVI"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "54-38N 025-06E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Numatytieji"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Klaidinga"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "mazgai"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Boforto skalė"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "colHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Grinvičo laikas (GMT)"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Trijų skaitmenų kodas radarų žemėlapiams iš weather.com gauti. Jį galima rasti adresu http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Unikali miesto zona. Ją galima rasti adresu http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Atnaujinti duomenis automatiškai"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Nustato, ar įtaisas automatiškai atnaujina savo oro sąlygų statistiką ar ne."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Rodyti _radarinius žemėlapius"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Nuotolio vienetai"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Atnaujinimo intervalas"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Gauti radarinį žemėlapį kiekvieno atnaujinimo metu."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervalas, sekundėmis, tarp automatiškų atnaujinimų."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Jeigu reikšmė teigiama, tada gauti radarinį žemėlapį iš adreso nurodyto „radar“ rakte."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Naudoti metrinius vienetus"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Jūsų vietovės geografinė platuma ir ilguma išreikšta DD-MM-SS[ŠP] DD-MM-SS[RV]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Naudoti metrinę matų sistemą vietoje angliškų vienetų."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Vietovės koordinatės"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Miestas netoliese"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Nuotolio vienetai"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Daugiau nebenaudojamas"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Slėgio vienetai"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radaro vietovė"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Greičio vienetai"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatūros vienetai"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Miestas, kuriam mateweather rodo informaciją"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Naudotojo nustatytas URL iš kur gaunamas radarinis žemėlapis."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Daugiau nebenaudojamas"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervalas, sekundėmis, tarp automatiškų atnaujinimų."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Rodyti _radarinius žemėlapius"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Vienetai naudojami slėgiui matuoti."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Gauti radarinį žemėlapį kiekvieno atnaujinimo metu."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Vienetai naudojami temperatūrai matuoti."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Vienetai naudojami matomumui matuoti."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Vietovės oro sąlygų informacija"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Vienetai naudojami vėjo greičiui matuoti."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Vietovės oro sąlygų informacija."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Atnaujinimo intervalas"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Atnaujinti duomenis automatiškai"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Miestas netoliese"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Radarinio žemėlapio URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Naudok pasirinktą adresą radaro žemėlapiui"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Naudoti metrinius vienetus"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Vietovės zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Naudoti metrinę matų sistemą vietoje angliškų vienetų."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radaro vietovė"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Oro sąlygos mieste"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Vietovės oro sąlygų informacija"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Miestas, kuriam mateweather rodo informaciją"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Vietovės oro sąlygų informacija."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Vietovės zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Vietovės koordinatės"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Jūsų vietovės geografinė platuma ir ilguma išreikšta DD-MM-SS[ŠP] DD-MM-SS[RV]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Naudok pasirinktą adresą radaro žemėlapiui"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Jeigu reikšmė teigiama, tada gauti radarinį žemėlapį iš adreso nurodyto „radar“ rakte."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Radarinio žemėlapio URL"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Naudotojo nustatytas URL iš kur gaunamas radarinis žemėlapis."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -462,11 +451,6 @@ msgstr "Šiaurės Vakarų"
 msgid "North - Northwest"
 msgstr "Šiaurės - Šiaurės Vakarų"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Klaidinga"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Giedras dangus"
diff --git a/po/lv.po b/po/lv.po
index a67cf56..09ecd13 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Artis Trops <[email protected]>, 2002.
+# Imants Liepiņš <[email protected]>, 2012.
 # Peteris Krisjanis <[email protected]>, 2006, 2010.
 # Peteris Krisjanis <[email protected]>, 2006.
 # Raivis Dejus <[email protected]>, 2006.
@@ -11,373 +12,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/MATE/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Rīga"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EVRA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "http://www.meteo.lv/pss/pss2.gif"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "56-55N 023-58E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Noklusētā"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nederīgs"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "mezgli"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Boforta skala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Griničas laiks"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Trīs ciparu kods, lai iegūtu radara kartes no weather.com, kas atrodamshttp://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Pilsētas unikālā zona, kā norādīts http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Atjaunināt datus automātiski"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Nosaka, vai sīklietotne automātiski atjaunina tās informāciju par laika apstākļiem vai nē."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Rādīt radara karti"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Distances vienība"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Atjaunināšanas intervāls"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Iegūt radara karti pie katra atjauninājuma."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervāls sekundēs starp automātiskajām atjaunināšanām."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ja patiesi (true), tad iegūt radara karti no vietas, kas norādīta \"radar\" atslēgā."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Lietot metriskās sistēmas vienības"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Jūsu atrašanās vietas platums un garums, kas izteikts formātā DD-MM-SS[ZG] DD-MM-SS[AP]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Lietot metriskās sistēmas vienības britu vienību vietā."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Atrašanās vietas koordinātes"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Tuvējā pilsēta"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Distances vienība"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Vairs netiek lietots"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Spiediena vienība"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radara atrašanās vieta"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Ātruma vienība"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatūras vienība"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Pilsēta, kuras laikapstākļus rādīs mateweather."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Pielāgotais URL, no kura iegūt radara karti."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Vairs netiek lietots"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervāls sekundēs starp automātiskajām atjaunināšanām."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Rādīt radara karti"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Vienība, ko izmantot spiediena norādīšanai."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Iegūt radara karti pie katra atjauninājuma."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Vienība, ko izmantot temperatūras norādīšanai."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Vienība, ko izmantot redzamības norādīšanai."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Laika ziņas atrašanās vietai"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Vienība, ko izmantot vēja ātruma norādīšanai."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Laika ziņas atrašanās vietai."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Atjaunināšanas intervāls"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Atjaunināt datus automātiski"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Tuvējā pilsēta"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL rada kartei"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Lietot pielāgotu adresi radara kartei"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Lietot metriskās sistēmas vienības"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zonas atrašanās vieta"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Lietot metriskās sistēmas vienības britu vienību vietā."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radara atrašanās vieta"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Laika ziņas pilsētai"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Laika ziņas atrašanās vietai"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Pilsēta, kuras laikapstākļus rādīs mateweather."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Laika ziņas atrašanās vietai."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zonas atrašanās vieta"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Atrašanās vietas koordinātes"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Jūsu atrašanās vietas platums un garums, kas izteikts formātā DD-MM-SS[ZG] DD-MM-SS[AP]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Lietot pielāgotu adresi radara kartei"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ja patiesi (true), tad iegūt radara karti no vietas, kas norādīta \"radar\" atslēgā."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL rada kartei"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Pielāgotais URL, no kura iegūt radara karti."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -462,11 +452,6 @@ msgstr "Ziemeļrietumu"
 msgid "North - Northwest"
 msgstr "Ziemeļu - ziemeļrietumu"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nederīgs"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Tīras debesis"
diff --git a/po/mai.po b/po/mai.po
index 319189a..3224c37 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mai\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "New Delhi/Palam"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VIDP"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "28-34N 077-07E"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "मूलभूत रेडार (_R)"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "मूलभूत"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "अवैध"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "नॉट्स"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ब्यूफोर्ट स्केल"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "किमी"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "डाटा स्वचालित अद्यतन करू"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "निर्धारित करैत अछि जे की एप्लेट एकर मौसम सांख्यिकीकेँ स्वचालित अद्यतन करैत अछि अथवा नहि."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "रेडार नक्शा देखाबू"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "दूरी एकाइ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "अद्यतन अंतराल"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "प्रत्येक अद्यतन पर एकटा रेडार नक्शा लाउ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "स्वचालित अद्यतन करब क' बीच सकेण्डमे अंतराल."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "जँ सत्य अछि तँ एकटा रेडॉर नक्शा \"रेडॉर\" कुँजीसँ निर्दिष्ट कएल स्थानसँ लाउ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "मीट्रिक यूनिट उपयोग करू"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "DD-MM-SS[NS] DD-MM-SS [EW]मे अहाँक द्वारा देल गेल अक्षांस आ देशांतर क' स्थिति"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "अंग्रेजी यूनिट क' बदला मीट्रिक यूनिट उपयोग करू"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "स्थान निर्देशांक"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "निकट क' शहर"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "दूरी एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "आब उपयोग नहि हाएत "
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "दबाव एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "रडार स्थान"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "गति एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "तापमान एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "शहर जकरा लेल जीवेदर सूचना देत अछि."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "जतएसँ रेडार नक़्शा लओनाइ अछि ओकर पसंदीदा यूआरएल."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "आब उपयोग नहि हाएत "
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "स्वचालित अद्यतन करब क' बीच सकेण्डमे अंतराल."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "रेडार नक्शा देखाबू"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "दबाव क'लेल उपयोग क'लेल एकाइ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "प्रत्येक अद्यतन पर एकटा रेडार नक्शा लाउ."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "तापमान क'लेल उपयोग क'लेल एकाइ."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "दृश्यता क'लेल उपयोग क'लेल एकाइ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "मौसम स्थान सूचना"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "वायु गति क'लेल उपयोग क'लेल एकाइ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "मौसम स्थान सूचना"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "अद्यतन अंतराल"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "डाटा स्वचालित अद्यतन करू"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "निकट क' शहर"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "रेडार नक्शा क' यूआरएल"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "रेडार नक्शा लेल विशेष यूआरएल उपयोग करू"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "मीट्रिक यूनिट उपयोग करू"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "क्षेत्र स्थान"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "अंग्रेजी यूनिट क' बदला मीट्रिक यूनिट उपयोग करू"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "रडार स्थान"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "शहर क'लेल मौसम रपट"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "मौसम स्थान सूचना"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "शहर जकरा लेल जीवेदर सूचना देत अछि."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "मौसम स्थान सूचना"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "क्षेत्र स्थान"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "स्थान निर्देशांक"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "DD-MM-SS[NS] DD-MM-SS [EW]मे अहाँक द्वारा देल गेल अक्षांस आ देशांतर क' स्थिति"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "रेडार नक्शा लेल विशेष यूआरएल उपयोग करू"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "जँ सत्य अछि तँ एकटा रेडॉर नक्शा \"रेडॉर\" कुँजीसँ निर्दिष्ट कएल स्थानसँ लाउ."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "रेडार नक्शा क' यूआरएल"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "जतएसँ रेडार नक़्शा लओनाइ अछि ओकर पसंदीदा यूआरएल."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "उत्तरपश्चिम"
 msgid "North - Northwest"
 msgstr "उत्तर - उत्तरपश्चिम"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "अवैध"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "स्वच्छ आकाश"
diff --git a/po/mg.po b/po/mg.po
index 3b014a8..6f61086 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mg\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Antananarivo"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "FMMI"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr " "
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Tsotra"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Tsy mety"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nœuds"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Fandrefesan'i Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Manavao ilay data hoazy"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Mamaritra ny famaritan'ilay appletn'ny ny rehan-toetr'androny hoazy."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Maneho ny saritanin-dradar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Ventin'ny halavirana"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Elanelan'ny fanavaozana"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Maka saritanin-dradar isaka ny fanavaozana."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Ny elanelan'ny fanavaozana mandeha hoazy (segaondra)."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Raha marina, dia maka saritanin-dradar any amin'ny toerana voafaritry ny famaha \"radara\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Mampiasà venty mifototra amin'ny metatra"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Lazaina amin'ny DD-MM-SS[NS] DD-MM-SS[EW] ny zana-pehintany sy ny lavam-pehintanin'ny toerana misy anao."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Venty mifototra amin'ny metatra ampiasaina fa tsy venty Anglisy."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordonnéen'ilay toerana"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Tanàna akaiky"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Ventin'ny halavirana"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Tsy ampiasaina intsony"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Ventin'ny tsindry"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Toeran'ny radara"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Ventin'ny hafainganana"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Ventin'ny hafanana"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Ny tanàna anehoan'ny mateweather laza."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Ny url safidy angalana saritanin-dradara."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Tsy ampiasaina intsony"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Ny elanelan'ny fanavaozana mandeha hoazy (segaondra)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Maneho ny saritanin-dradar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Ny venty ampiasaina amin'ny tsindry."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Maka saritanin-dradar isaka ny fanavaozana."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Ny venty ampiasaina amin'ny hafanana."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Ny venty ampiasaina amin'ny fahitana."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Ny venty ampiasaina amin'ny hafainganan'ny rivotra."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Elanelan'ny fanavaozana"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Manavao ilay data hoazy"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Tanàna akaiky"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url ho an'ny saritanin-dradara"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Ampisao ny url safidy ho an'ny saritanin-dradara"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Mampiasà venty mifototra amin'ny metatra"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Toerana misy ilay faritra"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Venty mifototra amin'ny metatra ampiasaina fa tsy venty Anglisy."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Toeran'ny radara"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Toetr'andron'ny tanàna iray"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Ny tanàna anehoan'ny mateweather laza."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Toerana misy ilay faritra"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordonnéen'ilay toerana"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Lazaina amin'ny DD-MM-SS[NS] DD-MM-SS[EW] ny zana-pehintany sy ny lavam-pehintanin'ny toerana misy anao."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Ampisao ny url safidy ho an'ny saritanin-dradara"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Raha marina, dia maka saritanin-dradar any amin'ny toerana voafaritry ny famaha \"radara\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url ho an'ny saritanin-dradara"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Ny url safidy angalana saritanin-dradara."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "Avaratra andrefana"
 msgid "North - Northwest"
 msgstr "Avaratra - Avaratra andrefana"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Tsy mety"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Lanitra manga"
diff --git a/po/mk.po b/po/mk.po
index fb56484..f1d0dec 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -15,373 +15,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Стандардно"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Невалидно"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "јазли"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Ажурирај ги податоците автоматски"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Одлучува дали аплетот автоматски ќе ги ажурира сопствените статистики за време или не."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Прикажи радарска мапа"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Единица за далечина"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Ажурирај интервал"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Земи радарска мапа на секое ажурирање."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Интервалот помеѓу автоматските ажурирања, во секунди."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Доколку е вклучено тогаш собирај ја радарската мапа од локацијата одредена во копчето „радар“."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Користи _метрички единици"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Височина и широчина на Вашата локација изразена во DD-MM-SS[NS] DD-MM-SS [EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Користи метрички единици мерки."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Координати на локацијата"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Град во близина"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Единица за далечина"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Не се користи повеќе"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Единица мерка за притисок"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Локација на радар"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Единица мерка за брзина"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Единица мерка за температура"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Градот за кој што mateweather прикажува информации."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Сопствената адреса за добивање на радарската мапа."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Не се користи повеќе"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Интервалот помеѓу автоматските ажурирања, во секунди."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Прикажи радарска мапа"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Единица мерка за притисок."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Земи радарска мапа на секое ажурирање."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Единица мерка за температурата."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Единица мерка за видливост."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Информации за локацијата и временските услови."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Единица мерка за брзина на ветерот."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Информации за локацијата и временските услови."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Ажурирај интервал"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Ажурирај ги податоците автоматски"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Град во близина"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Адреса за радарската мапа"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Користи сопствена адреса за радарската мапа"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Користи _метрички единици"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Зона на локација"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Користи метрички единици мерки."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Локација на радар"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Време за градот"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Информации за локацијата и временските услови."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Градот за кој што mateweather прикажува информации."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Информации за локацијата и временските услови."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Зона на локација"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Координати на локацијата"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Височина и широчина на Вашата локација изразена во DD-MM-SS[NS] DD-MM-SS [EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Користи сопствена адреса за радарската мапа"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Доколку е вклучено тогаш собирај ја радарската мапа од локацијата одредена во копчето „радар“."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Адреса за радарската мапа"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Сопствената адреса за добивање на радарската мапа."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -466,11 +455,6 @@ msgstr "Северозапад"
 msgid "North - Northwest"
 msgstr "Север - Северозапад"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Невалидно"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ведро небо"
diff --git a/po/ml.po b/po/ml.po
index ad6b205..6b9efc3 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -14,373 +14,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/MATE/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ml\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "തിരുവനന്തപുരം"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VOTV"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "8.466667 76.950000"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "സഹജമായ"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "കെ"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "സെ"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "ഫാ"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "അസാധു"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "മീ/സെ"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "കിമീ/മ"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ബ്യൂഫോര്‍ട്ട് അളവ്"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "മീ"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "കിമീ"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "ഗ്രീന്‍വിച്ച് മീന്‍ ടൈം"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com-ല്‍ നിന്നുളള റഡാര്‍ ഭൂപടങ്ങള്‍ ലഭ്യമാക്കുന്ന മൂന്നു് അക്കനീളമുളള കോഡ്, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in-ല്‍ നിന്നും ലഭ്യമായി."
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in-ല്‍ നിന്നും ലഭ്യമായതു് പോലെയുള്ളനഗരത്തിനുളള പ്രത്യേകമേഖല"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "ഡാറ്റ തനിയേ പുതുക്കുക"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "കാലവസ്ഥയുടെ സ്ഥിതിവിവരപ്പട്ടിക കാണിയ്ക്കുന്ന ലഘുപ്രയോഗം തനിയേ പുതുക്കുമോ എന്നു് നിശ്ചയിയ്ക്കുന്നു."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "റഡാര്‍ ഭൂപടം കാണിയ്ക്കുക"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "ദൂരം കാണിയ്ക്കുന്നതിനുള്ള ഏകകം"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "പുതുക്കലിനുളള ഇടവേള"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ഓരോ പുതുക്കലിലും ഒരു റഡാര്‍ ഭൂപടം എടുക്കുക."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "സ്വയം പുതുക്കുന്നതിന്റെ ഇടവേള (സെക്കന്‍ഡുകളില്‍)."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "ശരി എങ്കില്‍, \"radar (റഡാര്‍)\" കീ വ്യക്തമാക്കുന്ന സ്ഥലത്ത് നിന്നും റഡാര്‍ ഭൂപടം ലഭ്യമാക്കുക."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "മെട്രിക് ഏകകങ്ങള്‍ ഉപയോഗിക്കുക"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "നിങ്ങളുടെ പ്രദേശത്തിന്റെ അക്ഷാംശവും രേഖാംശവും DD-MM-SS[NS] DD-MM-SS[EW] എന്ന രീതിയില്‍."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ഇംഗ്ലീഷ് ഏകകങ്ങള്‍ക്കു് പകരം മെട്രിക് ഏകകങ്ങള്‍ ഉപയോഗിക്കുക."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "പ്രദേശത്തിന്റെ നിര്‍ദ്ദേശാങ്കങ്ങള്‍"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "അടുത്തുളള നഗരം"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "ദൂരം കാണിയ്ക്കുന്നതിനുള്ള ഏകകം"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "ഇപ്പോള്‍ ഉപയോഗത്തിലില്ല"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "മ‌ര്‍ദ്ദം കാണിയ്ക്കുന്നതിനുപയോഗിയ്ക്കേണ്ട ഏകകം"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "റഡാറിന്റെ സ്ഥാനം"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "വേഗത കാണിയ്ക്കുന്നതിനുള്ള ഏകകം"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "താപനില കാണിയ്ക്കുന്നതിനുള്ള ഏകകം"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather കാലാവസ്ഥ കാണിയ്ക്കുന്ന നഗരം."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "റഡാര്‍ ഭൂപടം ലഭ്യമാക്കുന്നതിനുളള യുആര്‍എല്‍."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "ഇപ്പോള്‍ ഉപയോഗത്തിലില്ല"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "സ്വയം പുതുക്കുന്നതിന്റെ ഇടവേള (സെക്കന്‍ഡുകളില്‍)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "റഡാര്‍ ഭൂപടം കാണിയ്ക്കുക"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "മര്‍ദ്ദം കാണിയ്ക്കുന്നതിനുളള ഏകകം."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ഓരോ പുതുക്കലിലും ഒരു റഡാര്‍ ഭൂപടം എടുക്കുക."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "താപനില കാണിയ്ക്കുന്നതിനുളള ഏകകം."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "ദൃശ്യത കാണിയ്ക്കുന്നതിനുളള ഏകകം."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "കാലാവസ്ഥ നല്‍കുന്ന സ്ഥലത്തേക്കുറിച്ചുള്ള വിവരങ്ങള്‍"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "കാറ്റിന്റെ വേഗത കാണിയ്ക്കുന്നതിനുളള ഏകകം."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "കാലാവസ്ഥ നല്‍കുന്ന സ്ഥലത്തേക്കുറിച്ചുള്ള വിവരങ്ങള്‍."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "പുതുക്കലിനുളള ഇടവേള"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "ഡാറ്റ തനിയേ പുതുക്കുക"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "അടുത്തുളള നഗരം"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "റഡാര്‍ ഭൂപടത്തിനുളള യുആര്‍എല്‍"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "റഡാര്‍ ഭൂപടത്തിനായി ഉപയോഗിക്കുന്ന യുആര്‍എല്‍"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "മെട്രിക് ഏകകങ്ങള്‍ ഉപയോഗിക്കുക"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "മേഖലയുടെ സ്ഥാനം"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ഇംഗ്ലീഷ് ഏകകങ്ങള്‍ക്കു് പകരം മെട്രിക് ഏകകങ്ങള്‍ ഉപയോഗിക്കുക."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "റഡാറിന്റെ സ്ഥാനം"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "ഒരു നഗരത്തിലെ കാലാവസ്ഥ"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "കാലാവസ്ഥ നല്‍കുന്ന സ്ഥലത്തേക്കുറിച്ചുള്ള വിവരങ്ങള്‍"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather കാലാവസ്ഥ കാണിയ്ക്കുന്ന നഗരം."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "കാലാവസ്ഥ നല്‍കുന്ന സ്ഥലത്തേക്കുറിച്ചുള്ള വിവരങ്ങള്‍."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "മേഖലയുടെ സ്ഥാനം"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "പ്രദേശത്തിന്റെ നിര്‍ദ്ദേശാങ്കങ്ങള്‍"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "നിങ്ങളുടെ പ്രദേശത്തിന്റെ അക്ഷാംശവും രേഖാംശവും DD-MM-SS[NS] DD-MM-SS[EW] എന്ന രീതിയില്‍."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "റഡാര്‍ ഭൂപടത്തിനായി ഉപയോഗിക്കുന്ന യുആര്‍എല്‍"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "ശരി എങ്കില്‍, \"radar (റഡാര്‍)\" കീ വ്യക്തമാക്കുന്ന സ്ഥലത്ത് നിന്നും റഡാര്‍ ഭൂപടം ലഭ്യമാക്കുക."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "റഡാര്‍ ഭൂപടത്തിനുളള യുആര്‍എല്‍"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "റഡാര്‍ ഭൂപടം ലഭ്യമാക്കുന്നതിനുളള യുആര്‍എല്‍."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -465,11 +454,6 @@ msgstr "വടക്കുപടിഞ്ഞാറു്"
 msgid "North - Northwest"
 msgstr "വടക്കു് - വടക്കുപടിഞ്ഞാറു്"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "അസാധു"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "തെളിഞ്ഞ ആകാശം"
diff --git a/po/mn.po b/po/mn.po
index 15c2dcb..03d4324 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -10,372 +10,361 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mn\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr ""
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr ""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr ""
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Буруу"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr ""
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr ""
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr ""
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "холболт (1.87 км/ч)"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr ""
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr ""
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr ""
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "ямх"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr ""
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
+#: ../libmateweather/mateweather-timezone.c:314
+msgid "Greenwich Mean Time"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Шинэчлэх завсар:"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
 msgstr ""
 
-#: ../libmateweather/mateweather-timezone.c:314
-msgid "Greenwich Mean Time"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:8
-msgid ""
-"Determines whether the applet automatically updates its weather statistics "
-"or not."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "Хэрэглэгдэхээ больсон."
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Шинэчлэх завсар:"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
 msgstr ""
 
 #: ../libmateweather/timezone-menu.c:277
@@ -461,11 +450,6 @@ msgstr "Баруун хойт"
 msgid "North - Northwest"
 msgstr "Баруун - Баруун хойт"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Буруу"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Тэнгэр цэлмэг"
diff --git a/po/mr.po b/po/mr.po
index 4aac7fa..9b2242b 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mr\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "मुलभूत"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "अवैध"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "मी/से"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "किमी/तास"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "नॉट्स"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ब्योफोर्ट पट्टी"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "किमी"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com पासून रडार नकाशे प्राप्त करण्यासाठी तीन-अंकीय-लांबीचे कोड, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in येथील प्रमाणे"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "शहरसाठी अनन्य झोन, http://svn.gnome.org/viewvc/libmateweather/trunk/data/Locations.xml.in येथील प्रमाणे"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "माहिती आपोआप अद्ययावत करा"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "एप्लेट आपोआप स्वतःची हवामान आकडेवारी ताजी करते की नाही ते ठरवते."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "रडार नकाशा दाखवा"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "अंतर एकक"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "अद्ययावतन अवकाश"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "प्रत्येक अद्यतनानंतर रडार नकाशा मिळवा."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "स्वयंचलित अद्ययावतांमधील अवकाश सेकंदांमध्ये."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "जर सत्य असेल, तर  \"रडार\" कळ ने दर्शवलेल्या ठिकाणापासून रडार नकाशा प्राप्त करा."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "मेट्रिक एकके वापरा"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "तुमच्या ठिकाणाचे अक्षांश आणि रेखांश  DD-MM-SS[NS] DD-MM-SS[EW] मध्ये दर्शवले आहेत."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "इंग्रजी एककांऐवजी मेट्रिक एकके वापरा."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "ठिकाणाचे अक्षांश"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "नजिकचे शहर"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "अंतर एकक"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "यापुढे वापरले जात नाही"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "दाब एकक"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "रडारचे ठिकाण"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "वेगाचे एकक"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "तापमानाचे एकक"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "शहर ज्याच्यासाठी mateweather माहिती दाखवते."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "रडार नकाशा कोठून प्राप्त करावा त्याचा स्वेच्छा url."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "यापुढे वापरले जात नाही"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "स्वयंचलित अद्ययावतांमधील अवकाश सेकंदांमध्ये."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "रडार नकाशा दाखवा"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "दाबासाठी वापरावयाचे एकक."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "प्रत्येक अद्यतनानंतर रडार नकाशा मिळवा."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "तापमानासाठी वापरावयाचे एकक."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "दृश्यतेसाठी वापरावयाचे एकक."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "हवामान ठिकाण माहिती"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "वाऱ्याच्या वेगासाठी वापरावयाचे एकक."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "हवामान ठिकाण माहिती."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "अद्ययावतन अवकाश"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "माहिती आपोआप अद्ययावत करा"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "नजिकचे शहर"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "रडार नकाशासाठी Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "रडार नकाशासाठी स्वेच्छेचा url वापरा"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "मेट्रिक एकके वापरा"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "झोन ठिकाण"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "इंग्रजी एककांऐवजी मेट्रिक एकके वापरा."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "रडारचे ठिकाण"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "शहराचे हवामान"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "हवामान ठिकाण माहिती"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "शहर ज्याच्यासाठी mateweather माहिती दाखवते."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "हवामान ठिकाण माहिती."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "झोन ठिकाण"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "ठिकाणाचे अक्षांश"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "तुमच्या ठिकाणाचे अक्षांश आणि रेखांश  DD-MM-SS[NS] DD-MM-SS[EW] मध्ये दर्शवले आहेत."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "रडार नकाशासाठी स्वेच्छेचा url वापरा"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "जर सत्य असेल, तर  \"रडार\" कळ ने दर्शवलेल्या ठिकाणापासून रडार नकाशा प्राप्त करा."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "रडार नकाशासाठी Url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "रडार नकाशा कोठून प्राप्त करावा त्याचा स्वेच्छा url."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "उत्तरपश्चिम"
 msgid "North - Northwest"
 msgstr "उत्तर - उत्तरपश्चिम"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "अवैध"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "स्वच्छ आकाश"
diff --git a/po/ms.po b/po/ms.po
index d781d10..dace4c7 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -4,388 +4,379 @@
 # 
 # Translators:
 # Hasbullah Bin Pit (sebol) <[email protected]>, 2003.
+#   <[email protected]>, 2012.
+#   <[email protected]>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/MATE/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Kuala Lumpur"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "WMKK"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "2-44N 101-42E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Default"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
-msgstr ""
+msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
-msgstr ""
+msgstr "F"
+
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Tak sah"
 
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/j"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "bsj"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knot"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
-msgstr ""
+msgstr "Skala "
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
-msgstr ""
+msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
-msgstr ""
-
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
+msgstr "mi"
 
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
-msgstr ""
+msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Kemaskini data secara automatik"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Menentukan samada aplet mengemaskini automatini statistik cuacanya atau tidak."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Papar peta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Selang masa kemaskini"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Sela sama, dalam saat, antara pengemaskinian automatik."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Guna sistem unit metrik"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Guna sistem unit metrik sebalik unit inggeris."
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
+msgstr "Unit jarak"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Ambil peta radar pada setiap kemaskini."
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "Unit tekanan"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "Unit kelajuan"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Unit suhu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "Tak digunakan lagi"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Papar peta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Ambil peta radar pada setiap kemaskini."
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informasi lokasi cuaca"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informasi lokasi cuaca."
+
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Bandar berdekatan"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Guna url tersendiri bagi peta radar."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Sela sama, dalam saat, antara pengemaskinian automatik."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Lokasi zone"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Unit untuk digunakan bagi tekanan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Unit untuk digunakan bagi penglihatan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Lokasi radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Unit untuk digunakan bagi kelajuan angin."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Selang masa kemaskini"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Cuaca untuk bandar"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Kemaskini data secara automatik"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Bandar yang mateweather paparkan informasinya."
+
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinat lokasi"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url bagi peta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud dan longtitud lokasi anda dinyatakan dalam DD-MM-SS[NS] DD-MM-SS[EW]."
 
-#: ../libmateweather/mateweather.schemas.in.h:32
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
 msgid "Use custom url for the radar map"
 msgstr "Guna url tersendiri bagi peta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Guna sistem unit metrik"
-
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Guna sistem unit metrik sebalik unit inggeris."
-
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Jika benar, akan mendapatkan peta radar dari lokasi yang dinyatakan dengan kekunci \"radar\"."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url bagi peta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Guna url tersendiri bagi peta radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
-msgstr ""
+msgstr "Tidak diketahui"
 
 #. Translators: %d is an error code, and %s the error string
 #: ../libmateweather/weather-metar.c:504
 #, c-format
 msgid "Failed to get METAR data: %d %s.\n"
-msgstr ""
+msgstr "Gagal mendapatkan data METAR:%d %s.\n"
 
 #: ../libmateweather/weather-metar.c:548
 msgid "WeatherInfo missing location"
@@ -459,11 +450,6 @@ msgstr "Barat laut"
 msgid "North - Northwest"
 msgstr "Utara - Barat Laut"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Tak sah"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Langit Cerah"
@@ -495,23 +481,23 @@ msgstr "Ribut Petir"
 #. DRIZZLE
 #: ../libmateweather/weather.c:293
 msgid "Drizzle"
-msgstr ""
+msgstr "Hujan renyai-renyai"
 
 #: ../libmateweather/weather.c:293
 msgid "Light drizzle"
-msgstr ""
+msgstr "Hujan rintik"
 
 #: ../libmateweather/weather.c:293
 msgid "Moderate drizzle"
-msgstr ""
+msgstr "Hujan renyai-renyai sederhana"
 
 #: ../libmateweather/weather.c:293
 msgid "Heavy drizzle"
-msgstr ""
+msgstr "Hujan lebat"
 
 #: ../libmateweather/weather.c:293
 msgid "Freezing drizzle"
-msgstr ""
+msgstr "Renyai-renyai beku"
 
 #. RAIN
 #: ../libmateweather/weather.c:294
@@ -520,7 +506,7 @@ msgstr "Hujan"
 
 #: ../libmateweather/weather.c:294
 msgid "Light rain"
-msgstr ""
+msgstr "Hujan"
 
 #: ../libmateweather/weather.c:294
 msgid "Moderate rain"
@@ -801,28 +787,28 @@ msgstr "Entah"
 #: ../libmateweather/weather.c:761
 #, c-format
 msgid "%.1f °F"
-msgstr ""
+msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
 #. U+00B0 DEGREE SIGN)
 #: ../libmateweather/weather.c:764
 #, c-format
 msgid "%d °F"
-msgstr ""
+msgstr "%d °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
 #. DEGREE SIGN)
 #: ../libmateweather/weather.c:770
 #, c-format
 msgid "%.1f °C"
-msgstr ""
+msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
 #. DEGREE SIGN)
 #: ../libmateweather/weather.c:773
 #, c-format
 msgid "%d °C"
-msgstr ""
+msgstr "%d °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
 #: ../libmateweather/weather.c:779
@@ -834,7 +820,7 @@ msgstr "%.1f K"
 #: ../libmateweather/weather.c:782
 #, c-format
 msgid "%d K"
-msgstr ""
+msgstr "%d K"
 
 #. TRANSLATOR: This is the humidity in percent
 #: ../libmateweather/weather.c:864
@@ -872,7 +858,7 @@ msgstr "%.1f m/s"
 #: ../libmateweather/weather.c:910
 #, c-format
 msgid "Beaufort force %.1f"
-msgstr ""
+msgstr "Beaufort force %.1f"
 
 #: ../libmateweather/weather.c:935
 msgid "Calm"
@@ -918,7 +904,7 @@ msgstr "%.2f mb"
 #: ../libmateweather/weather.c:981
 #, c-format
 msgid "%.3f atm"
-msgstr ""
+msgstr "%.3f atm"
 
 #. TRANSLATOR: This is the visibility in miles
 #: ../libmateweather/weather.c:1009
@@ -940,7 +926,7 @@ msgstr "%.0fm"
 
 #: ../libmateweather/weather.c:1046 ../libmateweather/weather.c:1067
 msgid "%H:%M"
-msgstr ""
+msgstr "%H:%M"
 
 #: ../libmateweather/weather.c:1126
 msgid "Retrieval failed"
diff --git a/po/nb.po b/po/nb.po
index 5d44418..cfa595e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/MATE/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Oslo/Gardermoen"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "ENGM"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Forvalg"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ugyldig"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/t"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knop"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort styrke"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich middeltid"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "En kode med tre siffer for henting av radarkart fra weather.com, hentet fra http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "En unik sone for byen som oppført i http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Oppdater dataene automatisk"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Bestemmer om programmet skal oppdatere værstatistikken automatisk eller ikke."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Vis radarkart"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Enhet for avstand"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Oppdateringsintervall"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hent et radarkart ved hver oppdatering."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervall for automatisk oppdatering i sekunder."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Hent et radarkart fra en lokasjon spesifisert i nøkkelen «radar» hvis denne er true."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Bruk metriske måleenheter"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Bredde- og lengdegrad for din lokasjon uttrykt i DD-MM-SS[NS] DD-MM-SS [EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Bruk metriske måleenheter i stedet for engelske enheter."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinater for lokasjon"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "By i nærheten"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Enhet for avstand"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ikke brukt lenger"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Enhet for trykk"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarlokasjon"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Enhet for hastighet"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Enhet for temperatur"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Byen mateweather viser informasjon for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Egendefinert URL for henting av radarkart."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ikke brukt lenger"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervall for automatisk oppdatering i sekunder."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Vis radarkart"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Enhet som skal brukes for trykk."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hent et radarkart ved hver oppdatering."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Enhet som skal brukes for trykk."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Enhet som skal brukes for synlighet."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informasjon om værlokasjon."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Enhet som skal brukes for vindhastighet."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informasjon om værlokasjon."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Oppdateringsintervall"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Oppdater dataene automatisk"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "By i nærheten"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL for radarkartet"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Bruk egendefinert URL for radarkart"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Bruk metriske måleenheter"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Lokasjon for sone"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Bruk metriske måleenheter i stedet for engelske enheter."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarlokasjon"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Værmelding for en by"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informasjon om værlokasjon."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Byen mateweather viser informasjon for."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informasjon om værlokasjon."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Lokasjon for sone"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinater for lokasjon"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Bredde- og lengdegrad for din lokasjon uttrykt i DD-MM-SS[NS] DD-MM-SS [EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Bruk egendefinert URL for radarkart"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Hent et radarkart fra en lokasjon spesifisert i nøkkelen «radar» hvis denne er true."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL for radarkartet"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Egendefinert URL for henting av radarkart."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Nordvest"
 msgid "North - Northwest"
 msgstr "Nord - nordvest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ugyldig"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Klar himmel"
diff --git a/po/ne.po b/po/ne.po
index cd2be67..f926e56 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -15,374 +15,363 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ne\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "काठमाडौं"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VNKT"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "----"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "27-41N 085-21E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "पूर्वनिर्धारित"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "अवैध"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "मिटर/सेकन्ड"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "किलोमिटर/सेकन्ड"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ब्युफोर्ट स्केल"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "स्वचालिततवरले डाटा अद्यावधिक गर्नुहोस"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "एप्लेट स्वचालित मौसम तथ्याङ्कसंगअध्यावधिक हुन्छ कि हुँदैन निर्धारण गर्छ"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "राडार नक्सा प्रदर्शन गर्नुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "अन्तराल अद्यावधिक गर्नुहोस"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "दूरी एकाइ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "स्वचालित अद्यावधिक बिचमा , सेकेन्डहरूमा अन्तराल"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "प्रत्येक अद्यावधिकमा एउटा राडार नक्सा ल्याउनुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "मेट्रिक एकाइहरू प्रयोग गर्नुहोस"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "यदि ठिक छ, भने \" कुञ्जी\" निर्दिष्ट रााडार स्थानबाट राडार नक्सा पुन: प्राप्त गर्नुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "अङ्ग्रेजी एकाइहरुको सट्टा मेट्रिक एकाइहरू प्रयोग गर्नुहोस"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "दूरी एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "धेरै प्रयोगमा छैन"
-
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "चाप एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "गति एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "तापक्रम एकाइ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "अनुकूलन यु आर एल जहाँ राडार नक्सा पुन: प्राप्त गर्नुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "धेरै प्रयोगमा छैन"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "स्वचालित अद्यावधिक बिचमा , सेकेन्डहरूमा अन्तराल"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "राडार नक्सा प्रदर्शन गर्नुहोस"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "एकाइ चापका लागि प्रयोग"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "प्रत्येक अद्यावधिकमा एउटा राडार नक्सा ल्याउनुहोस"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "एकाइ तापमानका लागि प्रयोग"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "एकाइ दृश्यात्मकका लागि प्रयोग"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "एकाइ हावा गतिका लागि प्रयोग"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "अन्तराल अद्यावधिक गर्नुहोस"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "स्वचालिततवरले डाटा अद्यावधिक गर्नुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "राडार नक्साका लागि यु आर एल"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "राडार नक्साका लागि अनुकूलन यु आर एल प्रयोग गर्नुहोस"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "मेट्रिक एकाइहरू प्रयोग गर्नुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "अङ्ग्रेजी एकाइहरुको सट्टा मेट्रिक एकाइहरू प्रयोग गर्नुहोस"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "राडार नक्साका लागि अनुकूलन यु आर एल प्रयोग गर्नुहोस"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "यदि ठिक छ, भने \" कुञ्जी\" निर्दिष्ट रााडार स्थानबाट राडार नक्सा पुन: प्राप्त गर्नुहोस"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "राडार नक्साका लागि यु आर एल"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "अनुकूलन यु आर एल जहाँ राडार नक्सा पुन: प्राप्त गर्नुहोस"
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -466,11 +455,6 @@ msgstr "उत्तर पश्चिम"
 msgid "North - Northwest"
 msgstr "उत्तर - उत्तर पश्चिम"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "अवैध"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "आकास खाली "
diff --git a/po/nl.po b/po/nl.po
index e97662e..22cd38e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,380 +3,369 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Michael Steenbeek <[email protected]>, 2012.
+# Michael Steenbeek <[email protected]>, 2012-2013.
 # Tino Meinen <[email protected]>, 2003, 2004, 2006, 2007.
 # Vincent van Adrighem <[email protected]>, 2003.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 11:34+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-09 16:47+0000\n"
 "Last-Translator: Michael Steenbeek <[email protected]>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/MATE/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Utrecht/Soesterberg"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EHSB"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "EHSB"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "EHSB"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "EHSB"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Standaard"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ongeldig"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/u"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mpu"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knopen"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort schaal"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Een 3-cijferige code voor het ophalen radarkaarten van weather.com. U kunt deze vinden op http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Een uniek gebied voor de stad. U kunt deze vinden op http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Gegevens automatisch verversen"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Bepaalt of het applet de weerstatistieken automatisch ververst of niet."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Radarkaart weergeven"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Afstands eenheid"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Verversingstijd"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Radarkaart ophalen bij iedere update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Het automatische verversingsinterval in seconden."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Indien ingeschakeld, een radarkaart ophalen van de locatie gespecificeerd in d sleutel \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Metrische eenheden gebruiken"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Lengte- en breedtegraad van uw locatie uitgedrukt in DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Metrische eenheden gebruiken in plaats van engelse eenheden."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Locatie coördinaten"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'meters'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Dichtstbijzijnde stad"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Afstands eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Dichtstbijzijnde belangrijke plaats, zoals hoofdstad, te vinden in http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "De eenheid voor zichtafstand. Mogelijke waarden: 'meters', 'km', 'miles'."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Niet meer gebruikt"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'hPa'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Luchtdruk eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarlocatie"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "De eenheid voor luchtdruk. Mogelijke waarden: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'Beaufort scale'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Snelheids eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "De eenheid voor windsnelheid. Mogelijke waarden: 'm/s', 'km/h, 'mph', 'knots', 'Beaufort scale'."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatuur eenheid"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "De stad waarover mateweather informatie toont."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "De eenheid voor temperatuur. Waarden: 'Kelvin', 'Centigrade', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "De aangepaste URL voor de radarkaart."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Niet meer gebruikt"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Het automatische verversingsinterval in seconden."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Radarkaart weergeven"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "De gebruikte eenheid voor druk."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Radarkaart ophalen bij iedere update."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "De gebruikte eenheid voor temperatuur."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'Baarle'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Weerbericht locatie-informatie"
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "De gebruikte eenheid voor zicht."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Weerbericht locatie-informatie."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "De gebruikte eenheid voor windsnelheid."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'EHEH'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Dichtstbijzijnde stad"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Verversingstijd"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Dichtsbijzijnde hoofdzone, bijvoorbeeld een hoofdstad. U kunt deze vinden op https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'DEFAULT_ZONE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zone locatie"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Gegevens automatisch verversen"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Een unieke zone voor de stad. U kunt deze vinden op https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr "' '"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarlocatie"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL voor de radarkaart"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Een 3-cijferige code voor het ophalen van radarkaarten van weather.com. U kunt deze vinden op https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Aangepaste URL gebruiken voor de radarkaart"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Weerbericht voor een stad"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Metrische eenheden gebruiken"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "De stad waarover mateweather informatie toont."
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Metrische eenheden gebruiken in plaats van engelse eenheden."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "'51-26-00N 4-55-00E'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Locatie coördinaten"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Weerbericht voor een stad"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Lengte- en breedtegraad van uw locatie uitgedrukt in DD-MM-SS[NS] DD-MM-SS[EW]."
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Weerbericht locatie-informatie"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Aangepaste URL gebruiken voor de radarkaart"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Weerbericht locatie-informatie."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Indien ingeschakeld, een radarkaart ophalen van de locatie gespecificeerd in d sleutel \"radar\"."
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zone locatie"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL voor de radarkaart"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "De aangepaste URL voor de radarkaart."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "Noordwest"
 msgid "North - Northwest"
 msgstr "Noord - Noordwest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ongeldig"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Heldere lucht"
diff --git a/po/nn.po b/po/nn.po
index 537b0c3..dcd035e 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,373 +12,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Stord/Sorstokken"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "ENSO"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "ENSO"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Standard"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ugyldig"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/t"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knop"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort-skala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mm Hg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "tommar Hg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Ein tre teikn lang kode for å henta radarkart frå weather.com. Henta frå http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Ein unik sone for for byen, funne i http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Oppdater vermålingane automatisk"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Styrer om programmet automatisk oppdaterer verstatistikken sin eller ikkje."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Vis radarkart"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Eining for avstand"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Tid mellom oppdateringar"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hent eit radarkart ved kvar oppdatering."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervall, i sekund, mellom automatiske oppdateringar."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Dersom sann, vert eit radarkart henta frå staden oppgjeve i nøkkelen «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Bruk metriske måleeiningar"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Lengdegrad og breiddegrad til staden du er, oppgjeve i GG-MM-SS[NS] GG-MM-SS[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Bruk metriske måleeiningar i staden for engelske."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Loordinatar for stad"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "By i nærleiken"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Eining for avstand"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ikkje i bruk lenger"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Trykkeining"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarplassering"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Fartseining"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperatureining"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Byen mateweather viser informasjon om."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Sjølvvald URL å henta radarkart frå."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ikkje i bruk lenger"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervall, i sekund, mellom automatiske oppdateringar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Vis radarkart"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Trykkeining å bruka."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hent eit radarkart ved kvar oppdatering."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Eining å bruka for temperatur."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Sikteining å bruka."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informasjon om staden vermeldinga er for"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Vindfarteining å bruka."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informasjon om staden vermeldinga er for."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Tid mellom oppdateringar"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Oppdater vermålingane automatisk"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "By i nærleiken"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL til radarkart"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Bruk sjølvvald URL til radarkartet"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Bruk metriske måleeiningar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Soneplassering"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Bruk metriske måleeiningar i staden for engelske."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarplassering"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Vermelding for ein by"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informasjon om staden vermeldinga er for"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Byen mateweather viser informasjon om."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informasjon om staden vermeldinga er for."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Soneplassering"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Loordinatar for stad"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Lengdegrad og breiddegrad til staden du er, oppgjeve i GG-MM-SS[NS] GG-MM-SS[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Bruk sjølvvald URL til radarkartet"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Dersom sann, vert eit radarkart henta frå staden oppgjeve i nøkkelen «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL til radarkart"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Sjølvvald URL å henta radarkart frå."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -463,11 +452,6 @@ msgstr "Nordvest"
 msgid "North - Northwest"
 msgstr "Nord-nordvest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ugyldig"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Klarver"
diff --git a/po/oc.po b/po/oc.po
index 0edccab..7692fe8 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: oc\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LFML"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "LFML"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Defaut"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Invalid"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nòdes"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Metre las donadas a jorn automaticament"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina se l'aplet met a jorn sas estadisticas meteo automaticament o non."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Visualizar la carta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval de mesa a jorn"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "L'interval en segondas entre las mesas a jorn automaticas."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Utilisar lo sistèma metric"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Utilisar lo sistèma metric en plaça del sistèma anglés."
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
 msgstr "Unitat de distancia"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Recobra una carta radar a cada mesa a jorn."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
+
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "Unitat de pression"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "Unitat de velocitat"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas del luòc"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Vila prèpa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Unitat de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "Pas mai utilisat"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr "Unitat de pression"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Visualizar la carta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Emplaçament de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Recobra una carta radar a cada mesa a jorn."
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
-msgstr "Unitat de velocitat"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr "Unitat de temperatura"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informacions sul luòc de meteò"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "La ciutat que mateweather mostra las informacions."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informacions sul luòc de meteò."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "L'URL personalizada ont recobrar una carta radar."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "L'interval en segondas entre las mesas a jorn automaticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Vila prèpa"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "L'unitat de pression a utilisar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "L'unitat de temperatura a utilisar."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "L'unitat de visibilitat a utilisar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Emplaçament de la zòna"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "L'unitat de velocitat de vent a utilisar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval de mesa a jorn"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Metre las donadas a jorn automaticament"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Emplaçament de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL de la carta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Utilisar una URL personalizada per la carta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Previsions meteò per una ciutat"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Utilisar lo sistèma metric"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "La ciutat que mateweather mostra las informacions."
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Utilisar lo sistèma metric en plaça del sistèma anglés."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Previsions meteò per una ciutat"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas del luòc"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informacions sul luòc de meteò"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informacions sul luòc de meteò."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Utilisar una URL personalizada per la carta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Emplaçament de la zòna"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL de la carta radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "L'URL personalizada ont recobrar una carta radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Nòrd-Oèst"
 msgid "North - Northwest"
 msgstr "Nòrd - Nòrd-Oest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Invalid"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cèl seren"
diff --git a/po/or.po b/po/or.po
index f837dab..2dc041e 100644
--- a/po/or.po
+++ b/po/or.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:20+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: or\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ଅବୈଧ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "ମିଟର/ସେକେଣ୍ଡ"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "କି.ମି/ଘଣ୍ଟା"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "ମାଇଲ ପ୍ରତି ଘଣ୍ଟା"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ନଟସ୍"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "ବିଉଫର୍ଟ ସ୍କେଲ"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa କିଲୋପାସ୍କେଲସ"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa ହେକ୍ଟୋ ପାସ୍କେଲସ"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb "
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg ପାରଦର ମିଲିବାର"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg ପାରଦର ଇଂଚ"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm ଅଟମୋସ୍ଫିଅର"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "ମି"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "କିଲୋମିଟର"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "ଗ୍ରୀନିଚ ମଧ୍ଯମ ସମୟ"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "ରାଡାର କାଢ଼ିବା ପାଇଁ ଗୋଟିଏ ତିନି ଅଙ୍କ ବିଶିଷ୍ଟ ସଂକେତ weather.com ରୁ ମ୍ୟାପ କରିଯାଇଥାଏ, http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ରୁ ମିଳିଥାଏ"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ରୁ ମିଳିଥିବା ପରି, ସେହି ସହର ପାଇଁ ଗୋଟିଏ ଅନନ୍ୟ ଅଞ୍ଚଳ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "ତଥ୍ଯକୁ ସ୍ବଯଂଚାଳିତଭାବରେ ଅପଡେଟ କର"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "ଆପଲେଟ ସ୍ବଯଂଚାଳିତଭାବରେ ଏହାର ପାଣିପାଗ ପରିସଂଖ୍ଯାନ ଅପଡେଟ କରେ କି ନାହିଁ ନିର୍ଧାରଣ କରେ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "ରାଡାର ମାନଚିତ୍ରକୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "ଦୂରତାର ମାପକ(ଯୁନିଟ)"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "ଅଦ୍ଯତନ ବିରତି"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ପ୍ରତି ଅଦ୍ଯତନରେ ଗୋଟିଏ ରାଡାର ମାନଚିତ୍ରକୁ କୌଶଳ ପୂର୍ବକ ଆଣନ୍ତୁ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "ସ୍ବୟଂଚାଳିତ ଅଦ୍ଯତନ ମାନଙ୍କ ମଧ୍ଯରେ ବିରତି ସମୟ, ସେକେଣ୍ଡରେ"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "ୟଦି ସତ୍ଯ ହୁଏ, ତେବେ \"ରଡାର\" କି ଦ୍ବାରା ନିଦ୍ଦିଷ୍ଟ ହୋଇଥିବା ଗୋଟିଏ ଅବସ୍ଥାନରୁ ଏକ ରଡାର ମ୍ଯାପକୁ ଉଦ୍ଧାର କର।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "ମେଟ୍ରିକ ଯୁନିଟଗୁଡିକୁ ଉପୟୋଗକର"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "ଆପଣଙ୍କର ଅବସ୍ଥାର ଅକ୍ଷାଂଶ ଏବଂ ଦ୍ରାଘିମା DD-MM-SS[NS] DD-MM-SS[EW] ରେ ପ୍ରକାଶିତ କରାୟାଏ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ଇଂଗ୍ରାଜୀ ଯୁନିଟଗୁଡିକ ପରିବର୍ତ୍ତେ ମେଟ୍ରିକ ଯୁନିଟଗୁଡିକୁ ଉପୟୋଗ କର।"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "ଅବସ୍ଥିତି ନିର୍ଦ୍ଧାରଣ ଉଚ୍ଚତା ପଦ୍ଧତି"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "ନିକଟବର୍ତ୍ତୀ ସହର"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "ଦୂରତାର ମାପକ(ଯୁନିଟ)"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "ଆଉ ଉପୟୋଗ ହେଉନାହିଁ"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "ଚାପ ଯୁନିଟ"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ରଡାର ଅବସ୍ଥାନ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "ବେଗ ଏକକ"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "ତାପମାନ ଏକକ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "ଯେଉଁ ମହାନଗର ପାଇଁ ଜି-ଓ୍ବେଦାର ସୂଚନା ପ୍ରଦର୍ଶିତ କରୁଅଛି।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ବ୍ଯବସ୍ଥାପିତ url କେଉଁଠାରୁ ରଡାର ମ୍ଯାପକୁ ପୁନଃପ୍ରାପ୍ତ କରିବା ପାଇଁ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "ଆଉ ଉପୟୋଗ ହେଉନାହିଁ"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "ସ୍ବୟଂଚାଳିତ ଅଦ୍ଯତନ ମାନଙ୍କ ମଧ୍ଯରେ ବିରତି ସମୟ, ସେକେଣ୍ଡରେ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "ରାଡାର ମାନଚିତ୍ରକୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "ଚାପ ମାପକ ଏକକ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ପ୍ରତି ଅଦ୍ଯତନରେ ଗୋଟିଏ ରାଡାର ମାନଚିତ୍ରକୁ କୌଶଳ ପୂର୍ବକ ଆଣନ୍ତୁ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "ତାପ ମାପକ ଏକକ।"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "ଦ୍ରୁଶ୍ଯମାନ୍ଯତା ମାପକ ଏକକ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "ପାଣିପାଗ ଅବସ୍ଥିତି ସୂଚନା"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "ପବନର ବେଗ ମାପକ ଏକକ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "ପାଣିପାଗ ଅବସ୍ଥିତି ସୂଚନା:"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "ଅଦ୍ଯତନ ବିରତି"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "ତଥ୍ଯକୁ ସ୍ବଯଂଚାଳିତଭାବରେ ଅପଡେଟ କର"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "ନିକଟବର୍ତ୍ତୀ ସହର"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "ରାଡାର ମାନଚିତ୍ର ପାଇଁ ୟୁ.ଆର.ଏଲ."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ରାଡାର ମାନଚିତ୍ର ପାଇଁ ଇଚ୍ଛାରୂପଣ ୟୁ.ଆର.ଏଲ. କୁ ବ୍ଯବହାର କରନ୍ତୁ"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "ମେଟ୍ରିକ ଯୁନିଟଗୁଡିକୁ ଉପୟୋଗକର"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "କ୍ଷେତ୍ର ଅବସ୍ଥିତି"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ଇଂଗ୍ରାଜୀ ଯୁନିଟଗୁଡିକ ପରିବର୍ତ୍ତେ ମେଟ୍ରିକ ଯୁନିଟଗୁଡିକୁ ଉପୟୋଗ କର।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ରଡାର ଅବସ୍ଥାନ"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "ଗୋଟିଏ ମହାନଗର ର ପାଣିପାଗ"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "ପାଣିପାଗ ଅବସ୍ଥିତି ସୂଚନା"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "ଯେଉଁ ମହାନଗର ପାଇଁ ଜି-ଓ୍ବେଦାର ସୂଚନା ପ୍ରଦର୍ଶିତ କରୁଅଛି।"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "ପାଣିପାଗ ଅବସ୍ଥିତି ସୂଚନା:"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "କ୍ଷେତ୍ର ଅବସ୍ଥିତି"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "ଅବସ୍ଥିତି ନିର୍ଦ୍ଧାରଣ ଉଚ୍ଚତା ପଦ୍ଧତି"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "ଆପଣଙ୍କର ଅବସ୍ଥାର ଅକ୍ଷାଂଶ ଏବଂ ଦ୍ରାଘିମା DD-MM-SS[NS] DD-MM-SS[EW] ରେ ପ୍ରକାଶିତ କରାୟାଏ।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ରାଡାର ମାନଚିତ୍ର ପାଇଁ ଇଚ୍ଛାରୂପଣ ୟୁ.ଆର.ଏଲ. କୁ ବ୍ଯବହାର କରନ୍ତୁ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "ୟଦି ସତ୍ଯ ହୁଏ, ତେବେ \"ରଡାର\" କି ଦ୍ବାରା ନିଦ୍ଦିଷ୍ଟ ହୋଇଥିବା ଗୋଟିଏ ଅବସ୍ଥାନରୁ ଏକ ରଡାର ମ୍ଯାପକୁ ଉଦ୍ଧାର କର।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "ରାଡାର ମାନଚିତ୍ର ପାଇଁ ୟୁ.ଆର.ଏଲ."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ବ୍ଯବସ୍ଥାପିତ url କେଉଁଠାରୁ ରଡାର ମ୍ଯାପକୁ ପୁନଃପ୍ରାପ୍ତ କରିବା ପାଇଁ।"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "ଉତ୍ତରପଶ୍ଚିମ"
 msgid "North - Northwest"
 msgstr "ଉତ୍ତର - ଉତ୍ତର ପଶ୍ଚିମ"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "ଅବୈଧ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "ପରିଷ୍କାର ଆକାଶ"
diff --git a/po/pa.po b/po/pa.po
index 5207174..79bfb6c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pa\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "ਅੰਮ੍ਰਿਤਸਰ"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VIAR"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr " "
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "31-38N 074-52E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ਗਲਤ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ਨਾਟ"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort ਸਕੇਲ"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "ਗਰੀਨਵਿਚ ਮੀਨ ਟਾਈਮ"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com ਤੋਂ ਰਾਡਾਰ ਨਕਸ਼ਾ ਲੈਣ ਲਈ ਤਿੰਨ-ਅੱਖਰਾਂ ਦਾ ਡਿਜ਼ੀਟਲ ਕੋਡ ਦਿਓ, ਜਿਸ ਨੂੰ http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ਤੋਂ ਵੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "ਸ਼ਹਿਰ ਲਈ ਵਿਲੱਖਣ ਖੇਤਰ ਹੈ, ਜਿਸ ਨੂੰ http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in ਵਿੱਚ ਵੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "ਡਾਟੇ ਦਾ ਅੱਪਡੇਟ ਆਟੋਮੈਟਿਕ ਹੀ ਕਰੋ"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "ਦੱਸੋ ਕਿ ਐਪਲਿਟ ਆਪਣੇ ਮੌਸਮ ਅੰਕੜਿਆਂ ਦਾ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਕਰੇ ਜਾਂ ਨਾ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਵੇਖੋ"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "ਦੂਰੀ ਯੂਨਿਟ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "ਅੱਪਡੇਟ ਅੰਤਰਾਲ"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ਹਰੇਕ ਅੱਪਡੇਟ ਲਈ ਰਾਡਾਰ-ਨਕਸ਼ਾ ਲਵੋ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਵਿਚਕਾਰ ਅੰਤਰਾਲ (ਸਕਿੰਟਾਂ ਵਿੱਚ)।"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "ਜੇਕਰ ਸੱਚ ਹੈ ਤਾਂ, ਰਾਡਾਰ-ਨਕਸ਼ਾ, ਉਥੋ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾਵੇਗਾ, ਜਿਥੋਂ ਕਿ \"ਰਾਡਾਰ\" ਕੁੰਜੀ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "ਮੀਟਰ ਇਕਾਈਆਂ ਵਰਤੋਂ"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਲਈ ਵਿਥਕਾਰ ਅਤੇ ਲੰਬਕਾਰ ਨੂੰ DD-MM-SS[NS] DD-MM-SS[EW] ਦੇ ਰੂਪ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ਅੰਗਰੇਜ਼ੀ ਇਕਾਈ ਦੀ ਬਜਾਏ ਮੀਟਰ ਇਕਾਈ ਵਰਤੋਂ"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "ਟਿਕਾਣਾ ਕੋਆਰਡੀਨੇਟ"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "ਨੇੜਲਾ ਸ਼ਹਿਰ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "ਦੂਰੀ ਯੂਨਿਟ"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "ਹੋਰ ਵਰਤੋਂ ਨਹੀਂ ਹੈ"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "ਦਬਾਉ ਯੂਨਿਟ"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ਰਾਡਾਰ ਟਿਕਾਣਾ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "ਗਤੀ ਯੂਨਿਟ/"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "ਤਾਪਮਾਨ ਯੂਨਿਟ/"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "ਸ਼ਹਿਰ, ਜਿਸ ਲਈ ਜੀ-ਮੌਸਮ ਜਾਣਕਾਰੀ ਵੇਖਾ ਰਿਹਾ ਹੈ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਲਈ ਸੋਧਿਆ Url ਹੈ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "ਹੋਰ ਵਰਤੋਂ ਨਹੀਂ ਹੈ"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਵਿਚਕਾਰ ਅੰਤਰਾਲ (ਸਕਿੰਟਾਂ ਵਿੱਚ)।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਵੇਖੋ"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "ਦਬਾਅ ਲਈ ਇਕਾਈ ਹੈ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ਹਰੇਕ ਅੱਪਡੇਟ ਲਈ ਰਾਡਾਰ-ਨਕਸ਼ਾ ਲਵੋ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "ਤਾਪਮਾਨ ਲਈ ਵਰਤਣ ਲਈ ਇਕਾਈ ਹੈ।"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "ਵੇਖਣ ਲਈ ਇਕਾਈ ਹੈ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "ਮੌਸਮ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "ਹਵਾ ਗਤੀ ਲਈ ਇਕਾਈ ਹੈ।"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "ਮੌਸਮ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਹੈ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "ਅੱਪਡੇਟ ਅੰਤਰਾਲ"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "ਡਾਟੇ ਦਾ ਅੱਪਡੇਟ ਆਟੋਮੈਟਿਕ ਹੀ ਕਰੋ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "ਨੇੜਲਾ ਸ਼ਹਿਰ"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਲਈ Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਲਈ ਸੋਧਿਆ Url ਵਰਤੋਂ"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "ਮੀਟਰ ਇਕਾਈਆਂ ਵਰਤੋਂ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "ਖੇਤਰ ਟਿਕਾਣਾ"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ਅੰਗਰੇਜ਼ੀ ਇਕਾਈ ਦੀ ਬਜਾਏ ਮੀਟਰ ਇਕਾਈ ਵਰਤੋਂ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ਰਾਡਾਰ ਟਿਕਾਣਾ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "ਇੱਕ ਸ਼ਹਿਰ ਲਈ ਮੌਸਮ"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "ਮੌਸਮ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "ਸ਼ਹਿਰ, ਜਿਸ ਲਈ ਜੀ-ਮੌਸਮ ਜਾਣਕਾਰੀ ਵੇਖਾ ਰਿਹਾ ਹੈ।"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "ਮੌਸਮ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਹੈ।"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "ਖੇਤਰ ਟਿਕਾਣਾ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "ਟਿਕਾਣਾ ਕੋਆਰਡੀਨੇਟ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਲਈ ਵਿਥਕਾਰ ਅਤੇ ਲੰਬਕਾਰ ਨੂੰ DD-MM-SS[NS] DD-MM-SS[EW] ਦੇ ਰੂਪ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਲਈ ਸੋਧਿਆ Url ਵਰਤੋਂ"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "ਜੇਕਰ ਸੱਚ ਹੈ ਤਾਂ, ਰਾਡਾਰ-ਨਕਸ਼ਾ, ਉਥੋ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾਵੇਗਾ, ਜਿਥੋਂ ਕਿ \"ਰਾਡਾਰ\" ਕੁੰਜੀ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਲਈ Url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ਰਾਡਾਰ ਨਕਸ਼ਾ ਲਈ ਸੋਧਿਆ Url ਹੈ।"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "ਉੱਤਰ ਪੱਛਮ"
 msgid "North - Northwest"
 msgstr "ਉੱਤਰ - ਉੱਤਰ ਪੱਛਮ"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "ਗਲਤ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "ਸਾਫ਼ ਆਸਮਾਨ"
diff --git a/po/pl.po b/po/pl.po
index 49d017c..e5e07d5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,377 +3,367 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bogusław B. <[email protected]>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/MATE/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Warszawa"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "EPWA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "52.166667 20.966667"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Domyślne"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Niewłaściwy"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
-msgstr "mph"
+msgstr "mi/h"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "węzły"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Skala Beauforta"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
-msgstr "km"
-
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
+msgstr "mi"
 
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Czas uniwersalny"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Trzyliterowy kod do pobierania map radarowych ze strony weather.com, zgodnie z http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Unikalna strefa dla miasta, zgodnie z http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Automatyczna aktualizacja danych"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Określa czy aplet automatycznie aktualizuje statystyki pogodowe."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Wyświetlanie mapy radarowej"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Jednostka odległości"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Okres odświeżania"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Pobieranie mapy radarowej podczas każdej aktualizacji."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Okres czasu, w sekundach, między automatycznymi aktualizacjami."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Określa, czy pobierać mapę radarową z położenia określonego w kluczu \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Wykorzystanie systemu metrycznego"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Szerokość i długość geograficzna położenia komputera wyrażona w DD-MM-SS[NS] (północ, południe) oraz DD-MM-SS[EW] (wschód, zachód)"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Wykorzystanie systemu metrycznego zamiast jednostek angielskich."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Współrzędne położenia"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'miles'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Pobliskie miasto"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Jednostka odległości"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "Jednostka używana do określenia widoczności. Jednostki: 'metry', 'km' ,'mile'."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Nie używane więcej"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'inHg'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Jednostka ciśnienia"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Położenie radarowe"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "Jednostka używana do ciśnienia. Jednostki: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'knots'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Jednostka prędkości"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Fahrenheit'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Jednostka temperatury"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Miasto, dla którego biblioteka gwaether wyświetla informacje."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "Jednostka używania do temperatury. Jednostki: 'Kelwin', 'Celsjusz', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Użycie własnego adresu URL, skąd pobierana jest mapa radarowa."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Nie używane więcej"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Okres czasu, w sekundach, między automatycznymi aktualizacjami."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Wyświetlanie mapy radarowej"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Używane jednostki ciśnienia."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Pobieranie mapy radarowej podczas każdej aktualizacji."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Używana jednostka temperatury."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Używana jednostka pomiaru widoczności."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informacja o miejscu prognozy"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Używana jednostka prędkości wiatru."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informacja o miejscu prognozy."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Okres odświeżania"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Automatyczna aktualizacja danych"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Pobliskie miasto"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Adres URL mapy radarowej"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Użycie własnego adresu URL mapy radarowej"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Wykorzystanie systemu metrycznego"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Położenie strefy"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Wykorzystanie systemu metrycznego zamiast jednostek angielskich."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Położenie radarowe"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Prognoza pogody dla miasta"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informacja o miejscu prognozy"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Miasto, dla którego biblioteka gwaether wyświetla informacje."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informacja o miejscu prognozy."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Położenie strefy"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Współrzędne położenia"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Szerokość i długość geograficzna położenia komputera wyrażona w DD-MM-SS[NS] (północ, południe) oraz DD-MM-SS[EW] (wschód, zachód)"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Użycie własnego adresu URL mapy radarowej"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Określa, czy pobierać mapę radarową z położenia określonego w kluczu \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Adres URL mapy radarowej"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Użycie własnego adresu URL, skąd pobierana jest mapa radarowa."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -458,11 +448,6 @@ msgstr "Północny zachód"
 msgid "North - Northwest"
 msgstr "Północ - północny zachód"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Niewłaściwy"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Czyste niebo"
@@ -599,11 +584,11 @@ msgstr "Kulki lodowe"
 
 #: ../libmateweather/weather.c:298
 msgid "Few ice pellets"
-msgstr "Nieco kulek lodowych"
+msgstr "Kilka kulek lodowych"
 
 #: ../libmateweather/weather.c:298
 msgid "Moderate ice pellets"
-msgstr "Umiarkowane kulki lodowe"
+msgstr "Umiarkowane kuli lodowe"
 
 #: ../libmateweather/weather.c:298
 msgid "Heavy ice pellets"
@@ -851,7 +836,7 @@ msgstr "%0.1f węzłów"
 #: ../libmateweather/weather.c:896
 #, c-format
 msgid "%.1f mph"
-msgstr "%.1f mph"
+msgstr "%.1f mi/h"
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
 #: ../libmateweather/weather.c:900
@@ -935,7 +920,7 @@ msgstr "%.1f km"
 #: ../libmateweather/weather.c:1017
 #, c-format
 msgid "%.0fm"
-msgstr "%.0fm"
+msgstr "%.0f m"
 
 #: ../libmateweather/weather.c:1046 ../libmateweather/weather.c:1067
 msgid "%H:%M"
diff --git a/po/pt.po b/po/pt.po
index a1e601b..e1c553f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,379 +1,371 @@
-# libmateweather' Portuguese translation.
-# Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 libmateweather
-# This file is distributed under the same license as the libmateweather package.
-# Duarte Loreto <[email protected]>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Carlos <[email protected]>, 2013.
+# Carlos  <[email protected]>, 2012.
+# Sérgio Marques <[email protected]>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.28\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 08:38+0100\n"
-"PO-Revision-Date: 2009-08-25 08:40+0000\n"
-"Last-Translator: Duarte Loreto <[email protected]>\n"
-"Language-Team: Portuguese <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-11 16:27+0000\n"
+"Last-Translator: Sérgio Marques <[email protected]>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/MATE/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#.
-#: ../libmateweather/mateweather-mateconf.c:212 ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Lisboa"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#.
-#: ../libmateweather/mateweather-mateconf.c:232 ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LPPT"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#.
-#: ../libmateweather/mateweather-mateconf.c:252 ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#.
-#: ../libmateweather/mateweather-mateconf.c:273 ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#.
-#: ../libmateweather/mateweather-mateconf.c:294 ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "38-46N 009-08W"
-
-#: ../libmateweather/mateweather-prefs.c:34 ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60 ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
-msgstr "Omissão"
+msgstr "Pré-definido"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nós"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103 ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141 ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183 ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224 ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
-msgstr "Tempo Médio de Greenwich"
-
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-"Um código de três dígitos para obter mapas de radar do weather.com, "
-"obtido em http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+msgstr "Tempo universal coordenado"
 
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from http://git.gnome.org/cgit/"
-"libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-"Uma zona única para a cidade, tal como em http://git.gnome.org/cgit/"
-"libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Atualizar dados automaticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
-msgstr ""
-"Determina se a applet actualiza ou não automaticamente as suas estatísticas "
-"de metereologia."
+msgstr "Determina se o suplemento atualiza automaticamente ou não as suas estatísticas meteorológicas."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Apresentar mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidade de distância"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de atualizações"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obter um mapa de radar a cada actualização."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "O intervalo, em segundos, entre atualizações automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the \"radar"
-"\" key."
-msgstr ""
-"Se verdadeiro, obter um mapa de radar da localização especificada pela chave "
-"\"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS"
-"[EW]."
-msgstr ""
-"Latitude e longitude da sua localização expressa em GG-MM-SS[NS] GG-MM-SS"
-"[EO]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usar unidades métricas em vez de inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas da localização"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'km/h'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Cidade mais próxima"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidade de distância"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from http://git.mate."
-"org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-"Zona principal mais próxima, tal como uma capital, tal como encontrada em "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "A unidade a usar para visibilidade. Valores: metros, km, milhas."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Obsoleto"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'mb'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidade de pressão"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Localização do radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "A unidade da pressão. Valores possíveis: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'knots'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidade de velocidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr "Unidade de temperatura"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "A unidade para a velocidade do vendo: 'm/s', 'km/h, 'mph', 'nós', 'Escala Beaufort'."
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "A cidade para a qual o mateweather apresenta a informação."
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "O url personalizado de onde obter o mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "Unidade de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "O intervalo, em segundos, entre actualizações automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "A unidade a usar para temperatura. Valores: 'Kelvin', 'Celsius', 'Fahrenheit'."
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "A unidade de pressão atmosférica a utilizar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Não usado mais"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "A unidade de temperatura a utilizar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostrar mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "A unidade de visibilidade a utilizar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obter mapa de radar ao atualizar"
+
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'DEFAULT_LOCATION'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informação local do tempo"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "A unidade de velocidade do vento a utilizar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informação local do tempo"
+
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'DEFAULT_CODE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Cidade vizinha"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de actualização"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Área mais próxima, tal como a capital, conforme descrita em https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'DEFAULT_ZONE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Local de zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizar os dados automaticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Uma zona única para a cidade, conforme descrita em https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr "'DEFAULT_RADAR'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Local do radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url para o mapa de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Um código com 3 dígitos para obter o mapoa de radar de weather.com, conforme descrito em https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Utilizar url personalizado para o mapa de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Tempo para uma cidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Utilizar o sistema métrico"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "A cidade para a qual mateweather exibe informação."
+
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "'DEFAULT_COORDINATES'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas do local"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Utilizar o sistema métrico em vez das unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitude e longitude do seu local expressa em GG-MM-SS[NS] GG-MM-SS[EO]"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Previsão metereológica para uma cidade"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usar URL personalizado para o mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informação de localização metereológica"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Se verdadeiro, é obtido um mapa de radar a partir de um local especificado pela chave \"radar\"."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informação de localização metereológica."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL para o mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Localização de zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "O URL personalizado para obter o mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -384,571 +376,558 @@ msgstr "Desconhecido"
 #: ../libmateweather/weather-metar.c:504
 #, c-format
 msgid "Failed to get METAR data: %d %s.\n"
-msgstr "Falha ao obter dados METAR: %d %s.\n"
+msgstr "Falha ao obter dados METAR: %d %s\n"
 
 #: ../libmateweather/weather-metar.c:548
 msgid "WeatherInfo missing location"
-msgstr "Localização não existe na WeatherInfo"
+msgstr "Local Weatherinfo em falta"
 
-#: ../libmateweather/weather.c:230
+#: ../libmateweather/weather.c:232
 msgid "Variable"
 msgstr "Variável"
 
-#: ../libmateweather/weather.c:231
+#: ../libmateweather/weather.c:233
 msgid "North"
 msgstr "Norte"
 
-#: ../libmateweather/weather.c:231
+#: ../libmateweather/weather.c:233
 msgid "North - NorthEast"
 msgstr "Norte - Nordeste"
 
-#: ../libmateweather/weather.c:231
+#: ../libmateweather/weather.c:233
 msgid "Northeast"
 msgstr "Nordeste"
 
-#: ../libmateweather/weather.c:231
+#: ../libmateweather/weather.c:233
 msgid "East - NorthEast"
 msgstr "Este - Nordeste"
 
-#: ../libmateweather/weather.c:232
+#: ../libmateweather/weather.c:234
 msgid "East"
 msgstr "Este"
 
-#: ../libmateweather/weather.c:232
+#: ../libmateweather/weather.c:234
 msgid "East - Southeast"
 msgstr "Este - Sudeste"
 
-#: ../libmateweather/weather.c:232
+#: ../libmateweather/weather.c:234
 msgid "Southeast"
 msgstr "Sudeste"
 
-#: ../libmateweather/weather.c:232
+#: ../libmateweather/weather.c:234
 msgid "South - Southeast"
 msgstr "Sul - Sudeste"
 
-#: ../libmateweather/weather.c:233
+#: ../libmateweather/weather.c:235
 msgid "South"
 msgstr "Sul"
 
-#: ../libmateweather/weather.c:233
+#: ../libmateweather/weather.c:235
 msgid "South - Southwest"
 msgstr "Sul - Sudoeste"
 
-#: ../libmateweather/weather.c:233
+#: ../libmateweather/weather.c:235
 msgid "Southwest"
 msgstr "Sudoeste"
 
-#: ../libmateweather/weather.c:233
+#: ../libmateweather/weather.c:235
 msgid "West - Southwest"
 msgstr "Oeste - Sudoeste"
 
-#: ../libmateweather/weather.c:234
+#: ../libmateweather/weather.c:236
 msgid "West"
 msgstr "Oeste"
 
-#: ../libmateweather/weather.c:234
+#: ../libmateweather/weather.c:236
 msgid "West - Northwest"
 msgstr "Oeste - Noroeste"
 
-#: ../libmateweather/weather.c:234
+#: ../libmateweather/weather.c:236
 msgid "Northwest"
 msgstr "Noroeste"
 
-#: ../libmateweather/weather.c:234
+#: ../libmateweather/weather.c:236
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:241 ../libmateweather/weather.c:258
-#: ../libmateweather/weather.c:330
-msgid "Invalid"
-msgstr "Inválido"
-
-#: ../libmateweather/weather.c:247
+#: ../libmateweather/weather.c:249
 msgid "Clear Sky"
-msgstr "Céu Limpo"
+msgstr "Céu limpo"
 
-#: ../libmateweather/weather.c:248
+#: ../libmateweather/weather.c:250
 msgid "Broken clouds"
-msgstr "Nublado"
+msgstr "Nuvens separadas"
 
-#: ../libmateweather/weather.c:249
+#: ../libmateweather/weather.c:251
 msgid "Scattered clouds"
-msgstr "Pouco nublado"
+msgstr "Nuvens espalhadas"
 
-#: ../libmateweather/weather.c:250
+#: ../libmateweather/weather.c:252
 msgid "Few clouds"
-msgstr "Algumas núvens"
+msgstr "Poucas nuvens"
 
-#: ../libmateweather/weather.c:251
+#: ../libmateweather/weather.c:253
 msgid "Overcast"
-msgstr "Muito nublado"
+msgstr "Nublado"
 
 #. TRANSLATOR: If you want to know what "blowing" "shallow" "partial"
 #. * etc means, you can go to http://www.weather.com/glossary/ and
 #. * http://www.crh.noaa.gov/arx/wx.tbl.php
 #. NONE
-#: ../libmateweather/weather.c:290 ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:292 ../libmateweather/weather.c:294
 msgid "Thunderstorm"
 msgstr "Trovoada"
 
 #. DRIZZLE
-#: ../libmateweather/weather.c:291
+#: ../libmateweather/weather.c:293
 msgid "Drizzle"
 msgstr "Chuviscos"
 
-#: ../libmateweather/weather.c:291
+#: ../libmateweather/weather.c:293
 msgid "Light drizzle"
 msgstr "Chuviscos ligeiros"
 
-#: ../libmateweather/weather.c:291
+#: ../libmateweather/weather.c:293
 msgid "Moderate drizzle"
 msgstr "Chuviscos moderados"
 
-#: ../libmateweather/weather.c:291
+#: ../libmateweather/weather.c:293
 msgid "Heavy drizzle"
 msgstr "Chuviscos fortes"
 
-#: ../libmateweather/weather.c:291
+#: ../libmateweather/weather.c:293
 msgid "Freezing drizzle"
-msgstr "Chuviscos com gelo"
+msgstr "Chuviscos gelados"
 
 #. RAIN
-#: ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:294
 msgid "Rain"
 msgstr "Chuva"
 
-#: ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:294
 msgid "Light rain"
 msgstr "Chuva ligeira"
 
-#: ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:294
 msgid "Moderate rain"
 msgstr "Chuva moderada"
 
-#: ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:294
 msgid "Heavy rain"
 msgstr "Chuva forte"
 
-#: ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:294
 msgid "Rain showers"
-msgstr "Chuveiros"
+msgstr "Aguaceiros"
 
-#: ../libmateweather/weather.c:292
+#: ../libmateweather/weather.c:294
 msgid "Freezing rain"
-msgstr "Chuva com gelo"
+msgstr "Chuva gelada"
 
 #. SNOW
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Snow"
 msgstr "Neve"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Light snow"
 msgstr "Neve ligeira"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Moderate snow"
 msgstr "Neve moderada"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Heavy snow"
 msgstr "Neve forte"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Snowstorm"
 msgstr "Tempestade de neve"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Blowing snowfall"
 msgstr "Neve com vento"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Snow showers"
-msgstr "Neve com chuva"
+msgstr "Aguaceiros de neve"
 
-#: ../libmateweather/weather.c:293
+#: ../libmateweather/weather.c:295
 msgid "Drifting snow"
 msgstr "Neve flutuante"
 
 #. SNOW_GRAINS
-#: ../libmateweather/weather.c:294
+#: ../libmateweather/weather.c:296
 msgid "Snow grains"
-msgstr "Grãos de neve"
+msgstr "Flocos de neve"
 
-#: ../libmateweather/weather.c:294
+#: ../libmateweather/weather.c:296
 msgid "Light snow grains"
-msgstr "Grãos de neve suaves"
+msgstr "Flocos de neve ligeiros"
 
-#: ../libmateweather/weather.c:294
+#: ../libmateweather/weather.c:296
 msgid "Moderate snow grains"
-msgstr "Grãos de neve moderados"
+msgstr "Flocos de neve moderados"
 
-#: ../libmateweather/weather.c:294
+#: ../libmateweather/weather.c:296
 msgid "Heavy snow grains"
-msgstr "Grãos de neve fortes"
+msgstr "Flocos de neve fortes"
 
 #. ICE_CRYSTALS
-#: ../libmateweather/weather.c:295
+#: ../libmateweather/weather.c:297
 msgid "Ice crystals"
 msgstr "Cristais de gelo"
 
 #. ICE_PELLETS
-#: ../libmateweather/weather.c:296
+#: ../libmateweather/weather.c:298
 msgid "Ice pellets"
-msgstr "Granizo"
+msgstr "Bolas de gelo"
 
-#: ../libmateweather/weather.c:296
+#: ../libmateweather/weather.c:298
 msgid "Few ice pellets"
-msgstr "Algum granizo"
+msgstr "Poucas bolas de gelo"
 
-#: ../libmateweather/weather.c:296
+#: ../libmateweather/weather.c:298
 msgid "Moderate ice pellets"
-msgstr "Granizo moderado"
+msgstr "Bolas de gelo moderadas"
 
-#: ../libmateweather/weather.c:296
+#: ../libmateweather/weather.c:298
 msgid "Heavy ice pellets"
-msgstr "Granizo forte"
+msgstr "Bolas de gelo fortes"
 
-#: ../libmateweather/weather.c:296
+#: ../libmateweather/weather.c:298
 msgid "Ice pellet storm"
-msgstr "Tempestade de granizo"
+msgstr "Tempestade de bolas de gelo"
 
-#: ../libmateweather/weather.c:296
+#: ../libmateweather/weather.c:298
 msgid "Showers of ice pellets"
-msgstr "Granizo com chuva"
+msgstr "Aguaceiros de bolas de gelo"
 
 #. HAIL
-#: ../libmateweather/weather.c:297
+#: ../libmateweather/weather.c:299
 msgid "Hail"
-msgstr "Nevoeiro"
+msgstr "Granizo"
 
-#: ../libmateweather/weather.c:297
+#: ../libmateweather/weather.c:299
 msgid "Hailstorm"
 msgstr "Tempestade de granizo"
 
-#: ../libmateweather/weather.c:297
+#: ../libmateweather/weather.c:299
 msgid "Hail showers"
-msgstr "Granizo com chuva"
+msgstr "Chuvas de granizo"
 
 #. SMALL_HAIL
-#: ../libmateweather/weather.c:298
+#: ../libmateweather/weather.c:300
 msgid "Small hail"
 msgstr "Granizo ligeiro"
 
-#: ../libmateweather/weather.c:298
+#: ../libmateweather/weather.c:300
 msgid "Small hailstorm"
-msgstr "Pequena tempestade de granizo"
+msgstr "Tempeste"
 
-#: ../libmateweather/weather.c:298
+#: ../libmateweather/weather.c:300
 msgid "Showers of small hail"
-msgstr "Granizo ligeiro com chuva"
+msgstr "Tempestade de granizo ligeira"
 
 #. PRECIPITATION
-#: ../libmateweather/weather.c:299
+#: ../libmateweather/weather.c:301
 msgid "Unknown precipitation"
 msgstr "Precipitação desconhecida"
 
 #. MIST
-#: ../libmateweather/weather.c:300
+#: ../libmateweather/weather.c:302
 msgid "Mist"
-msgstr "Névoa"
+msgstr "Neblina"
 
 #. FOG
-#: ../libmateweather/weather.c:301
+#: ../libmateweather/weather.c:303
 msgid "Fog"
 msgstr "Nevoeiro"
 
-#: ../libmateweather/weather.c:301
+#: ../libmateweather/weather.c:303
 msgid "Fog in the vicinity"
-msgstr "Nevoeiro nas proximidades"
+msgstr "Nevoeiro na vizinhança"
 
-#: ../libmateweather/weather.c:301
+#: ../libmateweather/weather.c:303
 msgid "Shallow fog"
-msgstr "Nevoeiro ligeiro"
+msgstr "Nevoeiro suave"
 
-#: ../libmateweather/weather.c:301
+#: ../libmateweather/weather.c:303
 msgid "Patches of fog"
-msgstr "Blocos de nevoeiro"
+msgstr "Bancos de nevoeiro"
 
-#: ../libmateweather/weather.c:301
+#: ../libmateweather/weather.c:303
 msgid "Partial fog"
 msgstr "Nevoeiro parcial"
 
-#: ../libmateweather/weather.c:301
+#: ../libmateweather/weather.c:303
 msgid "Freezing fog"
-msgstr "Nevoeiro com gelo"
+msgstr "Nevoeiro gelado"
 
 #. SMOKE
-#: ../libmateweather/weather.c:302
+#: ../libmateweather/weather.c:304
 msgid "Smoke"
 msgstr "Fumo"
 
 #. VOLCANIC_ASH
-#: ../libmateweather/weather.c:303
+#: ../libmateweather/weather.c:305
 msgid "Volcanic ash"
 msgstr "Cinza vulcânica"
 
 #. SAND
-#: ../libmateweather/weather.c:304
+#: ../libmateweather/weather.c:306
 msgid "Sand"
 msgstr "Areia"
 
-#: ../libmateweather/weather.c:304
+#: ../libmateweather/weather.c:306
 msgid "Blowing sand"
 msgstr "Areia com vento"
 
-#: ../libmateweather/weather.c:304
+#: ../libmateweather/weather.c:306
 msgid "Drifting sand"
-msgstr "Areia flutuante"
+msgstr "Areia dispersa"
 
 #. HAZE
-#: ../libmateweather/weather.c:305
+#: ../libmateweather/weather.c:307
 msgid "Haze"
-msgstr "Pó"
+msgstr "Névoa"
 
 #. SPRAY
-#: ../libmateweather/weather.c:306
+#: ../libmateweather/weather.c:308
 msgid "Blowing sprays"
-msgstr "Chuvadas com vento"
+msgstr "Sopros de vento"
 
 #. DUST
-#: ../libmateweather/weather.c:307
+#: ../libmateweather/weather.c:309
 msgid "Dust"
 msgstr "Pó"
 
-#: ../libmateweather/weather.c:307
+#: ../libmateweather/weather.c:309
 msgid "Blowing dust"
-msgstr "Pó com vento"
+msgstr "Pó e vento"
 
-#: ../libmateweather/weather.c:307
+#: ../libmateweather/weather.c:309
 msgid "Drifting dust"
 msgstr "Pó flutuante"
 
 #. SQUALL
-#: ../libmateweather/weather.c:308
+#: ../libmateweather/weather.c:310
 msgid "Squall"
-msgstr "Rajadas de vento"
+msgstr "Rajadas"
 
 #. SANDSTORM
-#: ../libmateweather/weather.c:309
+#: ../libmateweather/weather.c:311
 msgid "Sandstorm"
 msgstr "Tempestade de areia"
 
-#: ../libmateweather/weather.c:309
+#: ../libmateweather/weather.c:311
 msgid "Sandstorm in the vicinity"
-msgstr "Tempestade de areia nas proximidades"
+msgstr "Tempestade de areia na vizinhança"
 
-#: ../libmateweather/weather.c:309
+#: ../libmateweather/weather.c:311
 msgid "Heavy sandstorm"
-msgstr "Tempestade de areia forte"
+msgstr "Forte tempestade de areia "
 
 #. DUSTSTORM
-#: ../libmateweather/weather.c:310
+#: ../libmateweather/weather.c:312
 msgid "Duststorm"
 msgstr "Tempestade de pó"
 
-#: ../libmateweather/weather.c:310
+#: ../libmateweather/weather.c:312
 msgid "Duststorm in the vicinity"
-msgstr "Tempestade de pó nas proximidades"
+msgstr "Tempestade de pó na vizinhança"
 
-#: ../libmateweather/weather.c:310
+#: ../libmateweather/weather.c:312
 msgid "Heavy duststorm"
-msgstr "Tempestade de pó forte"
+msgstr "Forte tempestade de pó"
 
 #. FUNNEL_CLOUD
-#: ../libmateweather/weather.c:311
+#: ../libmateweather/weather.c:313
 msgid "Funnel cloud"
-msgstr "Núvens em funil"
+msgstr "Nuvem em funil"
 
 #. TORNADO
-#: ../libmateweather/weather.c:312
+#: ../libmateweather/weather.c:314
 msgid "Tornado"
 msgstr "Tornado"
 
 #. DUST_WHIRLS
-#: ../libmateweather/weather.c:313
+#: ../libmateweather/weather.c:315
 msgid "Dust whirls"
 msgstr "Remoinhos de pó"
 
-#: ../libmateweather/weather.c:313
+#: ../libmateweather/weather.c:315
 msgid "Dust whirls in the vicinity"
-msgstr "Remoinhos de pó nas proximidades"
+msgstr "Remoinhos de pó na vizinhança"
 
 #. TRANSLATOR: this is a format string for strftime
 #. *             see `man 3 strftime` for more details
-#.
-#: ../libmateweather/weather.c:703
+#. 
+#: ../libmateweather/weather.c:710
 msgid "%a, %b %d / %H:%M"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%a, %d de %b/%H:%M"
 
-#: ../libmateweather/weather.c:718
+#: ../libmateweather/weather.c:725
 msgid "Unknown observation time"
-msgstr "Data da observação desconhecida"
-
-#: ../libmateweather/weather.c:732 ../libmateweather/weather.c:783
-#: ../libmateweather/weather.c:797 ../libmateweather/weather.c:810
-#: ../libmateweather/weather.c:823 ../libmateweather/weather.c:836
-#: ../libmateweather/weather.c:854 ../libmateweather/weather.c:872
-#: ../libmateweather/weather.c:910 ../libmateweather/weather.c:926
-#: ../libmateweather/weather.c:949 ../libmateweather/weather.c:981
-#: ../libmateweather/weather.c:997 ../libmateweather/weather.c:1017
+msgstr "Tempo de observação desconhecido"
+
+#: ../libmateweather/weather.c:739 ../libmateweather/weather.c:790
+#: ../libmateweather/weather.c:804 ../libmateweather/weather.c:817
+#: ../libmateweather/weather.c:830 ../libmateweather/weather.c:843
+#: ../libmateweather/weather.c:861 ../libmateweather/weather.c:879
+#: ../libmateweather/weather.c:917 ../libmateweather/weather.c:933
+#: ../libmateweather/weather.c:956 ../libmateweather/weather.c:988
+#: ../libmateweather/weather.c:1004 ../libmateweather/weather.c:1024
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libmateweather/weather.c:754
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
+#. U+00B0 DEGREE SIGN)
+#: ../libmateweather/weather.c:761
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
-#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libmateweather/weather.c:757
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
+#. U+00B0 DEGREE SIGN)
+#: ../libmateweather/weather.c:764
 #, c-format
 msgid "%d °F"
 msgstr "%d °F"
 
-#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libmateweather/weather.c:763
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
+#. DEGREE SIGN)
+#: ../libmateweather/weather.c:770
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
-#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libmateweather/weather.c:766
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
+#. DEGREE SIGN)
+#: ../libmateweather/weather.c:773
 #, c-format
 msgid "%d °C"
 msgstr "%d °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libmateweather/weather.c:772
+#: ../libmateweather/weather.c:779
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libmateweather/weather.c:775
+#: ../libmateweather/weather.c:782
 #, c-format
 msgid "%d K"
 msgstr "%d K"
 
 #. TRANSLATOR: This is the humidity in percent
-#: ../libmateweather/weather.c:857
+#: ../libmateweather/weather.c:864
 #, c-format
 msgid "%.f%%"
 msgstr "%.f%%"
 
 #. TRANSLATOR: This is the wind speed in knots
-#: ../libmateweather/weather.c:885
+#: ../libmateweather/weather.c:892
 #, c-format
 msgid "%0.1f knots"
 msgstr "%0.1f nós"
 
 #. TRANSLATOR: This is the wind speed in miles per hour
-#: ../libmateweather/weather.c:889
+#: ../libmateweather/weather.c:896
 #, c-format
 msgid "%.1f mph"
 msgstr "%.1f mph"
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
-#: ../libmateweather/weather.c:893
+#: ../libmateweather/weather.c:900
 #, c-format
 msgid "%.1f km/h"
 msgstr "%.1f km/h"
 
 #. TRANSLATOR: This is the wind speed in meters per second
-#: ../libmateweather/weather.c:897
+#: ../libmateweather/weather.c:904
 #, c-format
 msgid "%.1f m/s"
 msgstr "%.1f m/s"
 
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
-#.
-#: ../libmateweather/weather.c:903
+#. 
+#: ../libmateweather/weather.c:910
 #, c-format
 msgid "Beaufort force %.1f"
 msgstr "Força Beaufort %.1f"
 
-#: ../libmateweather/weather.c:928
+#: ../libmateweather/weather.c:935
 msgid "Calm"
 msgstr "Calmo"
 
 #. TRANSLATOR: This is 'wind direction' / 'wind speed'
-#: ../libmateweather/weather.c:932
+#: ../libmateweather/weather.c:939
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
 #. TRANSLATOR: This is pressure in inches of mercury
-#: ../libmateweather/weather.c:954
+#: ../libmateweather/weather.c:961
 #, c-format
 msgid "%.2f inHg"
 msgstr "%.2f inHg"
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
-#: ../libmateweather/weather.c:958
+#: ../libmateweather/weather.c:965
 #, c-format
 msgid "%.1f mmHg"
 msgstr "%.1f mmHg"
 
 #. TRANSLATOR: This is pressure in kiloPascals
-#: ../libmateweather/weather.c:962
+#: ../libmateweather/weather.c:969
 #, c-format
 msgid "%.2f kPa"
 msgstr "%.2f kPa"
 
 #. TRANSLATOR: This is pressure in hectoPascals
-#: ../libmateweather/weather.c:966
+#: ../libmateweather/weather.c:973
 #, c-format
 msgid "%.2f hPa"
 msgstr "%.2f hPa"
 
 #. TRANSLATOR: This is pressure in millibars
-#: ../libmateweather/weather.c:970
+#: ../libmateweather/weather.c:977
 #, c-format
 msgid "%.2f mb"
 msgstr "%.2f mb"
 
 #. TRANSLATOR: This is pressure in atmospheres
-#: ../libmateweather/weather.c:974
+#: ../libmateweather/weather.c:981
 #, c-format
 msgid "%.3f atm"
 msgstr "%.3f atm"
 
 #. TRANSLATOR: This is the visibility in miles
-#: ../libmateweather/weather.c:1002
+#: ../libmateweather/weather.c:1009
 #, c-format
 msgid "%.1f miles"
 msgstr "%.1f milhas"
 
 #. TRANSLATOR: This is the visibility in kilometers
-#: ../libmateweather/weather.c:1006
+#: ../libmateweather/weather.c:1013
 #, c-format
 msgid "%.1f km"
 msgstr "%.1f km"
 
 #. TRANSLATOR: This is the visibility in meters
-#: ../libmateweather/weather.c:1010
+#: ../libmateweather/weather.c:1017
 #, c-format
 msgid "%.0fm"
-msgstr "%.0fm"
+msgstr "%.0f m"
 
-#: ../libmateweather/weather.c:1039 ../libmateweather/weather.c:1060
+#: ../libmateweather/weather.c:1046 ../libmateweather/weather.c:1067
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: ../libmateweather/weather.c:1119
+#: ../libmateweather/weather.c:1126
 msgid "Retrieval failed"
-msgstr "Falha ao obter"
-
-#~ msgid "%.1f ℉"
-#~ msgstr "%.1f ℉"
-
-#~ msgid "%d ℉"
-#~ msgstr "%d ℉"
-
-#~ msgid "%.1f ℃"
-#~ msgstr "%.1f ℃"
-
-#~ msgid "%d ℃"
-#~ msgstr "%d ℃"
+msgstr "Falhou a obtenção"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d6cf4c3..f0bdb16 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,373 +17,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-28 21:56+0000\n"
-"Last-Translator: Fabrizzio Alphonsus Soares <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/MATE/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Fernando de Noronha"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "SBFN"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "03-51S 032-25W"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Padrão"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "ºC"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "ºF"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Inválido"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "nós"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Escala Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Hora de Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Um código de três dígitos para recuperar mapas de radares de weather.com, localizado em http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Uma zona única para a cidade, como localizada em http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Atualizar os dados automaticamente"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Determina se o miniaplicativo atualiza automaticamente suas estatísticas de clima ou não."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Mostra mapa de radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unidade de distância"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervalo de atualização"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Obter um mapa de radar a cada atualização."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "O intervalo, em segundos, entre as atualizações automáticas."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Se verdadeiro, obtém-se um mapa de radar a partir de uma localização especificada pela chave \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Usar unidades métricas"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "latitude e longitude da sua localidade, expressa em GG-MM-SS[NS] GG-MM-SS[EW] (G = graus, M = minutos, S = segundos; N = norte, S = sul, E = leste, W = oeste)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Usar unidades do sistema métrico em vez das unidades inglesas."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordenadas da localidade"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Cidade vizinha"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unidade de distância"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Proximidades maiores, como capitais, são encontradas em http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Não mais usado"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unidade de pressão"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Localização do radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unidade de velocidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unidade de temperatura"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "A cidade cuja informação o mateweather exibe."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "A URL personalizada de onde obter um mapa de radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Não mais usado"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "O intervalo, em segundos, entre as atualizações automáticas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Mostra mapa de radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "A unidade de pressão para usar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Obter um mapa de radar a cada atualização."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "A unidade para usar para temperatura."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "A unidade para usar para visibilidade."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informações sobre o tempo da localidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "A unidade para usar para de velocidade do vento."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informações sobre o tempo da localidade."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervalo de atualização"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Atualizar os dados automaticamente"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Cidade vizinha"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL para o mapa de radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Usar URL personalizada para o mapa de radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Usar unidades métricas"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Localização da zona"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Usar unidades do sistema métrico em vez das unidades inglesas."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Localização do radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Tempo em uma cidade"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informações sobre o tempo da localidade"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "A cidade cuja informação o mateweather exibe."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informações sobre o tempo da localidade."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Localização da zona"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordenadas da localidade"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "latitude e longitude da sua localidade, expressa em GG-MM-SS[NS] GG-MM-SS[EW] (G = graus, M = minutos, S = segundos; N = norte, S = sul, E = leste, W = oeste)."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Usar URL personalizada para o mapa de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Se verdadeiro, obtém-se um mapa de radar a partir de uma localização especificada pela chave \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL para o mapa de radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "A URL personalizada de onde obter um mapa de radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -468,11 +457,6 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Inválido"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Céu Claro"
diff --git a/po/ro.po b/po/ro.po
index 408e2a6..68c1711 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "București"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LRBS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "44.500000 26.133333"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Implicit"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nevalid"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "noduri"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Scara Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Ora Greenwich"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Un cod de trei cifre pentru a prelua hărți radar de la weather.com, aflat de la http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "O zonă unică pentru oraș, care se găsește în http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Actualizează datele automat"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Decide dacă miniaplicația își actualizează automat statisticile meteorologice sau nu."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Afișează harta radar"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Unitate de distanță"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval de actualizare"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Preia o hartă radar la fiecare actualizare."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervalul, în secunde, dintre actualizările automate."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Dacă este definit ca „true”, atunci găsește o hartă radar dintr-o locație specificată de cheia „radar”."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Utilizează unități metrice"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitudinea și longitudinea locației dumneavoastră exprimate în GG-MM-SS[NS] GG-MM-SS[EV]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Utilizează unități metrice în loc de unități englezești."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Coordonatele locației"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Oraș din apropiere"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Unitate de distanță"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "O zonă majoră apropiată, cum ar fi o capitală, după cum apare la http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Nu se mai folosește"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Unitate de presiune"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Locație radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Unitate de viteză"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Unitate de temperatură"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Orașul pentru care mateweather afișează informații."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Adresa URL la alegere, de unde să fie preluată o hartă radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Nu se mai folosește"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervalul, în secunde, dintre actualizările automate."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Afișează harta radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Unitatea care va fi utilizată pentru presiune."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Preia o hartă radar la fiecare actualizare."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Unitatea care va fi utilizată pentru temperatură."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Unitatea care va fi utilizată pentru vizibilitate."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informații despre locația stației meteo"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Unitatea care va fi utilizată pentru viteza vântului."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informații despre locația stației meteo."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval de actualizare"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Actualizează datele automat"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Oraș din apropiere"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url pentru harta radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Utilizează url-ul ales pentru harta radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Utilizează unități metrice"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Locația zonei"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Utilizează unități metrice în loc de unități englezești."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Locație radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Buletin meteo pentru un oraș"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informații despre locația stației meteo"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Orașul pentru care mateweather afișează informații."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informații despre locația stației meteo."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Locația zonei"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Coordonatele locației"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitudinea și longitudinea locației dumneavoastră exprimate în GG-MM-SS[NS] GG-MM-SS[EV]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Utilizează url-ul ales pentru harta radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Dacă este definit ca „true”, atunci găsește o hartă radar dintr-o locație specificată de cheia „radar”."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url pentru harta radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Adresa URL la alegere, de unde să fie preluată o hartă radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "Nord-Vest"
 msgid "North - Northwest"
 msgstr "Nord-Nord-Vest"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nevalid"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Cer senin"
diff --git a/po/ru.po b/po/ru.po
index 1abddb1..fd64cad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 # Translators:
 # Alexander Ovcharenko <[email protected]>, 2003.
 # Alexandre Prokhudine, 2002.
-# Alexei Sorokin <[email protected]>, 2012.
+# Alexei Sorokin <[email protected]>, 2012-2013.
 # Leonid Kanter <[email protected]>, 2002-2004, 2005, 2006, 2007, 2009.
 # Michael Yakhontov <[email protected]>, 2003.
 # Sergey Panov <[email protected]>, 1999.
@@ -14,373 +14,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-17 14:49+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-10 11:37+0000\n"
 "Last-Translator: Alexei Sorokin <[email protected]>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/MATE/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Москва - Шереметьево"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "UUEE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr " "
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "55-59N 037-30E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "По умолчанию"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Недопустимый"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "м/с"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "км/ч"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "миля/ч"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "узел"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "шкала Бофорта"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "килопаскаль"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "гектопаскаль"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "миллибар"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "мм рт. ст."
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "дюйм рт. ст."
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "атм"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "м"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "километры"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "миля"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "По Гринвичу"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Трёхзначный код для получения радарных карт от weather.com — его можно найти по адресу http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Уникальная зона для города — её можно найти в http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Обновлять данные автоматически"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Определяет, нужно ли автоматически обновлять данные о погоде."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Показывать радарную карту"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Единица расстояния"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Промежуток между обновлениями"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Изменять радарную карту при каждом обновлении."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Промежуток времени (в секундах) между автоматическими обновлениями."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Если этот ключ установлен, то получать радарную карту из адреса, заданного ключом «radar»."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Использовать метрическую систему"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Ваши широта и долгота в формате DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Использовать метрическую систему мер вместо английской системы."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Координаты местоположения"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'km'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Ближайший город"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Единица расстояния"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Близлежащие основные зоны как столицы, как найдены в http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "Единица расстояния. Значения: 'meters', 'km' ,'miles'."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Больше не используется"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'kPa'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Единица давления"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Радарный адрес"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "Единица давления. Значения: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'km/h'"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Единица скорости"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "Единица скорости ветра. Значения: 'm/s', 'km/h, 'mph', 'knots', 'Beaufort scale'."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Единица температуры"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Город, погоду в котором показывает mateweather."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "Единица температуры. Значения: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Пользовательский адрес для получения радарной карты."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Больше не используется"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Промежуток времени (в секундах) между автоматическими обновлениями."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Показывать радарную карту"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Используемая единица измерения давления."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Изменять радарную карту при каждом обновлении."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Используемая единица измерения температуры."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "Аэропорт Шереметьево"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Сведения о погоде в местоположении"
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Используемая единица измерения видимости."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Сведения о погоде в местоположении."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Используемая единица измерения скорости ветра."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "UUEE"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Промежуток между обновлениями"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Ближайший город"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Обновлять данные автоматически"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Близлежащие основные зоны как столицы, найденные в https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr " "
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Адрес для радарной карты"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Местоположение зоны"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Использовать собственный адрес для радарной карты"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Уникальная зона для города, найденная в https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr " "
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Использовать метрическую систему"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Радарный адрес"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Использовать метрическую систему мер вместо английской системы."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Трёхзначный код для получения радарных карт от weather.com, найденный в https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Погода для города"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Сведения о погоде в местоположении"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Город, погоду в котором показывает mateweather."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Сведения о погоде в местоположении."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "55.983333 37.500000"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Координаты местоположения"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Местоположение зоны"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Ваши широта и долгота в формате DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Использовать собственный адрес для радарной карты"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Если этот ключ установлен, то получать радарную карту из адреса, заданного ключом «radar»."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Адрес для радарной карты"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Пользовательский адрес для получения радарной карты."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -465,11 +454,6 @@ msgstr "Северо-западный"
 msgid "North - Northwest"
 msgstr "Северо-северо-западный"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Недопустимый"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ясное небо"
diff --git a/po/si.po b/po/si.po
index 3fc2c7d..a7fc375 100644
--- a/po/si.po
+++ b/po/si.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: si\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "පෙරනිමි"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "සාවද්‍ය"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "බෝපට් පරිමාණය"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "mb"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "කිලෝ මිටර"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "දත්ත ස්වයංක්‍රීයව යාවත්කාල කරන්න"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "රේඩාර් සිතියම දක්වන්න"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "යාවත්කාල විරාමය"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "මෙට්‍රික් ඒකක භාවිතා කරන්න"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ඉංග්‍රීසි ඒකක වෙනුවට මෙට්‍රික් ඒකක භාවිතා කරන්න."
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
 msgstr "දුර ඒකකය"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "පීඩන ඒකකය"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "වේග ඒකකය"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "ලගම නගරය"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "උෂ්ණත්ව ඒකකය"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "තවදුරටත් භාවිතා නොකරයි"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr "පීඩන ඒකකය"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "රේඩාර් සිතියම දක්වන්න"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "රේඩාර් ස්ථානය"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
-msgstr "වේග ඒකකය"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr "උෂ්ණත්ව ඒකකය"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "කාළගුණ ස්ථාන තොරතුරු"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "කාළගුණ ස්ථාන තොරතුරු."
+
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "ලගම නගරය"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "පීඩනය සඳහා භාවිතා කරන ඒකකය."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "කලාප ස්ථාන"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "උෂ්ණත්වය සඳහා භාවිතා කරන ඒකකය."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "දෘෂෘතාවය සඳහා භාවිතා කරන ඒකකය."
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "සුළං වේගය සඳහා භාවිතා කරන ඒකකය."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "රේඩාර් ස්ථානය"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "යාවත්කාල විරාමය"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "දත්ත ස්වයංක්‍රීයව යාවත්කාල කරන්න"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "නගරයක් සඳහා කාළගුණය"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "රේඩාර් සිතියම සඳහා Url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "මෙට්‍රික් ඒකක භාවිතා කරන්න"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ඉංග්‍රීසි ඒකක වෙනුවට මෙට්‍රික් ඒකක භාවිතා කරන්න."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "නගරයක් සඳහා කාළගුණය"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "කාළගුණ ස්ථාන තොරතුරු"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "කාළගුණ ස්ථාන තොරතුරු."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "රේඩාර් සිතියම සඳහා Url"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "කලාප ස්ථාන"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr ""
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "වයඹ"
 msgid "North - Northwest"
 msgstr "උතුර - වයඹ"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "සාවද්‍ය"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "පැහැදිළිඅහස"
diff --git a/po/sk.po b/po/sk.po
index 6f723a0..05819bf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/MATE/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Bratislava"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LZIB"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "48.150000 17.116667"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Štandardné"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Neplatné"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "uzlov"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufortova stupnica"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mbar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "míľ"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "greenwichský stredný čas"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Trojčíslicový kód pre získavanie radarových máp z weather.com, ako sa dá nájsť na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Jedinečná zóna pre mesto, ako sa dá nájsť na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Aktualizovať údaje automaticky"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Určuje, či aplet bude automaticky aktualizovať svoje štatistiky o počasí alebo nie."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Zobraziť radarovú mapu"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Jednotka vzdialenosti"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval aktualizácie"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Získať radarovú mapu pri každej aktualizácii."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Interval (v sekundách) medzi automatickými aktualizáciami."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ak je true, radarová mapa sa získa z umiestnenia zadaného v kľúči \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Použiť metrické jednotky"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Zemepisná šírka a dĺžka vášho miesta vyjadrená v tvare DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Použiť metrické jednotky namiesto anglických jednotiek."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Súradnice miesta"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Blízke mesto"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Jednotka vzdialenosti"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Už nepoužívané"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Jednotka tlaku"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Umiestnenie radaru"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Jednotka rýchlosti"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Jednotka teploty"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Mesto, pre ktoré mateweather zobrazuje informácie."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Vlastné url, z ktorého získať radarovú mapu."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Už nepoužívané"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Interval (v sekundách) medzi automatickými aktualizáciami."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Zobraziť radarovú mapu"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Jednotka, ktorá bude použitá pre tlak."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Získať radarovú mapu pri každej aktualizácii."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Jednotka, ktorá bude použitá pre teplotu."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Jednotka, ktorá bude použitá pre viditeľnosť."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Informácia o počasí pre miesto"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Jednotka, ktorá bude použitá pre rýchlosť vetra."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Informácia o počasí pre miesto."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval aktualizácie"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Aktualizovať údaje automaticky"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Blízke mesto"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url pre radarovú mapu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Použiť vlastné url pre radarovú mapu"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Použiť metrické jednotky"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Umiestnenie zóny"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Použiť metrické jednotky namiesto anglických jednotiek."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Umiestnenie radaru"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Počasie pre mesto"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Informácia o počasí pre miesto"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Mesto, pre ktoré mateweather zobrazuje informácie."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Informácia o počasí pre miesto."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Umiestnenie zóny"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Súradnice miesta"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Zemepisná šírka a dĺžka vášho miesta vyjadrená v tvare DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Použiť vlastné url pre radarovú mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ak je true, radarová mapa sa získa z umiestnenia zadaného v kľúči \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url pre radarovú mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Vlastné url, z ktorého získať radarovú mapu."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "Severozápad"
 msgid "North - Northwest"
 msgstr "Severo-severozápad"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Neplatné"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Jasno"
diff --git a/po/sl.po b/po/sl.po
index cd611e3..795f16e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,373 +11,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/MATE/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Ljubljana"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LJLJ"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "46-13N 014-29E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Privzeto"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Neveljavno"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "milj/uro"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "vozlov"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufortova lestvica"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwiški srednji čas"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Tri številćna koda za pridobivanje radarskih map s portala weather.com, kot je zapisano na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Edinstveno območje mesta kot je zapisano na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Samodejno posodobi podatke"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Ali naj vstavek samodejno posodablja svoje statistične podatke o vremenu ali ne."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Pokaži radarsko sliko"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Enota razdalje"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Interval posodabljanja"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Prenesi radarsko sliko ob vsaki posodobitvi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Čas (v sekundah) med samodejnimi posodobitvami."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Če je resnično, potem dobi radarsko sliko iz mesta navedenega v ključu \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Uporabljaj metrične enote"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Zemljepisna višina in širina vaše lokacije zapisana kot: DD-MM-SS[SJ) DD-MM-SS [VZ]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Uporabljaj metrične enote namesto angleških."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinate lokacije"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Bližnje mesto"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Enota razdalje"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Bližnje večje območje, kot so glavna mesta, zapisana na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ni več v uporabi"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Enote pritiska"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Položaj radarja"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Enote hitrosti"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Enote temperature"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Mesto, za katerega mateweather prikazuje podatke."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Prilagojen URL iz kjer naj se naloži radarska slika"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ni več v uporabi"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Čas (v sekundah) med samodejnimi posodobitvami."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Pokaži radarsko sliko"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Enota uporabljena za pritisk."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Prenesi radarsko sliko ob vsaki posodobitvi"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Enota uporabljena za temperaturo."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Enota uporabljena za vidljivost."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Podatki o položaju vremena."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Enote, ki naj se uporabijo za hitrost vetra."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Podatki o položaju vremena."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Interval posodabljanja"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Samodejno posodobi podatke"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Bližnje mesto"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL radarske slike"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Uporabi prilagojen URL za radarsko sliko"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Uporabljaj metrične enote"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Položaj območja"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Uporabljaj metrične enote namesto angleških."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Položaj radarja"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Vreme za mesto"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Podatki o položaju vremena."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Mesto, za katerega mateweather prikazuje podatke."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Podatki o položaju vremena."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Položaj območja"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinate lokacije"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Zemljepisna višina in širina vaše lokacije zapisana kot: DD-MM-SS[SJ) DD-MM-SS [VZ]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Uporabi prilagojen URL za radarsko sliko"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Če je resnično, potem dobi radarsko sliko iz mesta navedenega v ključu \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL radarske slike"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Prilagojen URL iz kjer naj se naloži radarska slika"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -462,11 +451,6 @@ msgstr "Severozahod"
 msgid "North - Northwest"
 msgstr "Sever - severozahod"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Neveljavno"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Jasno nebo"
diff --git a/po/sq.po b/po/sq.po
index b9f9492..e5cfa93 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,383 +3,373 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alban  <[email protected]>, 2012.
 # Laurent Dhima <[email protected]>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/MATE/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sq\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Tirana"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LATI"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "41-20N 019-47E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "E paracaktuar"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "Kelvin"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "Celsius"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "Farenheit"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "E pavlefshme"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "Metra në sekondë"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "Kilometra në orë"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "Milje në orë"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "Nyje"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Shkalla Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "Kilopascal"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "Ektopascal"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "Milibar"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "Milimetra mërkur"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inç mërkur"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "Atmosferë"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "Metra"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "Kilometra"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "Milje"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+msgstr "Greenwich ora mesatare"
 
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Përditëso të dhënat automatikisht"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Përcakton nëse mini-aplikativi duhet të përditësojë automatikisht statistikat e motit apo jo."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Shfaq hartën e radarit"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Njësia e distancës"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Intervali i përditësimit"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Tërhiq një hartë radari në çdo përditësim."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervali, në sekonda, midis përditësimeve automatike."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Nëse caktuar tek E VËRTETË, shkarkohet një hartë radar nga një vendndodhje e specifikuar në kyçin \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Përdor sistemin metrik dhjetor"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Gjerësia dhe gjatësia gjeografike (latitude + longitude) e zonës suaj shprehur në \"GG-MM-SS[NS] GG-MM-SS[EW]\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Përdor sistemin metrik dhjetor në vend të sistemit anglez."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinatat e zonës"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Qytet afër"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Njësia e distancës"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Nuk përdoret më"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Njësia e trysnisë"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Vendndodhja e radarit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Njësia e shpejtësisë"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Njësia e temperaturës"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Qyteti për të cilin mateweather shfaq informacionet."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Url e personalizuar prej nga tërhiqet një hartë radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Nuk përdoret më"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervali, në sekonda, midis përditësimeve automatike."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Shfaq hartën e radarit"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Njësia e matjes që duhet përdorur për trysninë."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Tërhiq një hartë radari në çdo përditësim."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Njësia e matjes që duhet përdorur për temperaturën."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Njësia e matjes që duhet përdorur për dukshmërinë."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "informacione moti për një zonë"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Njësia e matjes që duhet përdorur për shpejtësinë e erës."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "informacione moti për një zonë."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Intervali i përditësimit"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Përditëso të dhënat automatikisht"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Qytet afër"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url për hartën radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Përdor url të personalizuar për hartën radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Përdor sistemin metrik dhjetor"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Vendndodhja e zonës"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Përdor sistemin metrik dhjetor në vend të sistemit anglez."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Vendndodhja e radarit"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Kushtet atmosferike për një qytet"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "informacione moti për një zonë"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Qyteti për të cilin mateweather shfaq informacionet."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "informacione moti për një zonë."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Vendndodhja e zonës"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinatat e zonës"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Gjerësia dhe gjatësia gjeografike (latitude + longitude) e zonës suaj shprehur në \"GG-MM-SS[NS] GG-MM-SS[EW]\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Përdor url të personalizuar për hartën radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Nëse caktuar tek E VËRTETË, shkarkohet një hartë radar nga një vendndodhje e specifikuar në kyçin \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url për hartën radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Url e personalizuar prej nga tërhiqet një hartë radar."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
-msgstr ""
+msgstr "i panjohur"
 
 #. Translators: %d is an error code, and %s the error string
 #: ../libmateweather/weather-metar.c:504
@@ -459,11 +449,6 @@ msgstr "Veri-Perëndim"
 msgid "North - Northwest"
 msgstr "Veri - Veri-Perëndim"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "E pavlefshme"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Qiell i Hapur"
@@ -801,28 +786,28 @@ msgstr "Nuk njihet"
 #: ../libmateweather/weather.c:761
 #, c-format
 msgid "%.1f °F"
-msgstr ""
+msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is
 #. U+00B0 DEGREE SIGN)
 #: ../libmateweather/weather.c:764
 #, c-format
 msgid "%d °F"
-msgstr ""
+msgstr "%d °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
 #. DEGREE SIGN)
 #: ../libmateweather/weather.c:770
 #, c-format
 msgid "%.1f °C"
-msgstr ""
+msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0
 #. DEGREE SIGN)
 #: ../libmateweather/weather.c:773
 #, c-format
 msgid "%d °C"
-msgstr ""
+msgstr "%d °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
 #: ../libmateweather/weather.c:779
diff --git a/po/sr.po b/po/sr.po
index f831027..444b249 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Београд,Сурчин"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LYBE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr " "
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "44-49N 020-17E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Подразумевано"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "Келвин"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "Целзијус"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "Фаренхајт"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Неисправно"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "м/с"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "км/ч"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "миља/ч"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "чворова"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Бофорова скала"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "атмосфера"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "метара"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "километара"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "миља"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Гриничко средње време"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Троцифрени код за преузимање радарских карти са weather.com, како се може наћи на http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Јединствена зона за град, како се може наћи на http://git.gnome.org/cgit/mate-applets/trunk/mateweather/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Освежи податке аутоматски"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Одређује да ли програмче аутоматски освежава прогнозу или не."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Прикажи радарску мапу"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Јединице растојања"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Време између допуна"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Преузми радарску мапу при сваком освежавању."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Размак, у секундама, између два освежавања."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Уколико је постављено, довлачи радарску мапу са адресе наведене помоћу кључа „radar“."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Користити метрички систем јединица"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Географска ширина и дужина вашег места изражена као СС-ММ-СС[NS] СС-ММ-СС[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Користи метрички систем јединица уместо енглеског система."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Координате места"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Оближњи град"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Јединице растојања"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Више се не користи"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Јединице притиска"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Положај радара"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Јединице брзине"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Јединице температуре"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Град за који се приказују подаци."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Адреса по избору одакле се довлачи радарска мапа."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Више се не користи"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Размак, у секундама, између два освежавања."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Прикажи радарску мапу"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Које јединице користити за притисак."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Преузми радарску мапу при сваком освежавању."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Које јединице користити за температуру."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Које јединице користити за видљивост."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Подаци о месту за прогнозу"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Које јединице користити за брзину ветра."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Подаци о месту за прогнозу."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Време између допуна"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Освежи податке аутоматски"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Оближњи град"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Адреса за радарску мапу"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Користи адресу по избору за радарску мапу"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Користити метрички систем јединица"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Место зоне"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Користи метрички систем јединица уместо енглеског система."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Положај радара"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Временске прилике за град"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Подаци о месту за прогнозу"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Град за који се приказују подаци."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Подаци о месту за прогнозу."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Место зоне"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Координате места"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Географска ширина и дужина вашег места изражена као СС-ММ-СС[NS] СС-ММ-СС[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Користи адресу по избору за радарску мапу"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Уколико је постављено, довлачи радарску мапу са адресе наведене помоћу кључа „radar“."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Адреса за радарску мапу"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Адреса по избору одакле се довлачи радарска мапа."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Северозападни"
 msgid "North - Northwest"
 msgstr "Северно-Северозападни"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Неисправно"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Ведро небо"
diff --git a/po/[email protected] b/po/[email protected]
index 9cff811..88750fe 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Beograd,Surčin"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LYBE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr " "
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "44-49N 020-17E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Podrazumevano"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "Kelvin"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "Celzijus"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "Farenhajt"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Neispravno"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/č"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "milja/č"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "čvorova"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Boforova skala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atmosfera"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "metara"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "kilometara"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "milja"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Griničko srednje vreme"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Trocifreni kod za preuzimanje radarskih karti sa weather.com, kako se može naći na http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Jedinstvena zona za grad, kako se može naći na http://git.gnome.org/cgit/mate-applets/trunk/mateweather/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Osveži podatke automatski"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Određuje da li programče automatski osvežava prognozu ili ne."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Prikaži radarsku mapu"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Jedinice rastojanja"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Vreme između dopuna"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Preuzmi radarsku mapu pri svakom osvežavanju."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Razmak, u sekundama, između dva osvežavanja."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ukoliko je postavljeno, dovlači radarsku mapu sa adrese navedene pomoću ključa „radar“."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Koristiti metrički sistem jedinica"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Geografska širina i dužina vašeg mesta izražena kao SS-MM-SS[NS] SS-MM-SS[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Koristi metrički sistem jedinica umesto engleskog sistema."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Koordinate mesta"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Obližnji grad"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Jedinice rastojanja"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Više se ne koristi"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Jedinice pritiska"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Položaj radara"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Jedinice brzine"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Jedinice temperature"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Grad za koji se prikazuju podaci."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Adresa po izboru odakle se dovlači radarska mapa."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Više se ne koristi"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Razmak, u sekundama, između dva osvežavanja."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Prikaži radarsku mapu"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Koje jedinice koristiti za pritisak."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Preuzmi radarsku mapu pri svakom osvežavanju."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Koje jedinice koristiti za temperaturu."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Koje jedinice koristiti za vidljivost."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Podaci o mestu za prognozu"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Koje jedinice koristiti za brzinu vetra."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Podaci o mestu za prognozu."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Vreme između dopuna"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Osveži podatke automatski"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Obližnji grad"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Adresa za radarsku mapu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Koristi adresu po izboru za radarsku mapu"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Koristiti metrički sistem jedinica"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Mesto zone"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Koristi metrički sistem jedinica umesto engleskog sistema."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Položaj radara"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Vremenske prilike za grad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Podaci o mestu za prognozu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Grad za koji se prikazuju podaci."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Podaci o mestu za prognozu."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Mesto zone"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Koordinate mesta"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Geografska širina i dužina vašeg mesta izražena kao SS-MM-SS[NS] SS-MM-SS[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Koristi adresu po izboru za radarsku mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ukoliko je postavljeno, dovlači radarsku mapu sa adrese navedene pomoću ključa „radar“."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Adresa za radarsku mapu"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Adresa po izboru odakle se dovlači radarska mapa."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "Severozapadni"
 msgid "North - Northwest"
 msgstr "Severno-Severozapadni"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Neispravno"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Vedro nebo"
diff --git a/po/sv.po b/po/sv.po
index f3bfff2..d5304b0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,373 +12,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:19+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/MATE/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Stockholm (Arlanda)"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "ESSA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr " "
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "59-39N 017-57E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Standard"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ogiltig"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "engelska mil/h"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knop"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beauforts skala"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Mean Time"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "En tre-siffrig kod för hämtning av radarkartor från weather.com. Koden kan hittas i http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "En unik zon för staden som kan hittas i http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Uppdatera data automatiskt"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Avgör huruvida panelprogrammet automatiskt uppdaterar sin väderstatistik eller inte."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Visa radarkarta"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Avståndsenhet"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Uppdateringsintervall"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Hämta en radarkarta vid varje uppdatering."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Intervallet, i sekunder, mellan automatiska uppdateringar."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Om denna nyckel är sann hämtas en radarkarta från den plats som anges av nyckeln \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Använd metriska enheter"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Latitud och longitud för platsen uttryckt i DD-MM-SS[NS] DD-MM-SS [ÖV]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Använd metriska enheter istället för engelska enheter."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Platskoordinater"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Närliggande stad"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Avståndsenhet"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Används inte längre"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Tryckenhet"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radarplats"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Hastighetsenhet"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Temperaturenhet"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Staden som mateweather visar information om."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Den anpassade url där en radarkarta ska hämtas ifrån."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Används inte längre"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Intervallet, i sekunder, mellan automatiska uppdateringar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Visa radarkarta"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Enhet att använda för tryck."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Hämta en radarkarta vid varje uppdatering."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Enhet att använda för temperatur."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Enhet att använda för sikt."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Väderplatsinformation"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Enhet att använda för vindhastighet."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Väderplatsinformation."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Uppdateringsintervall"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Uppdatera data automatiskt"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Närliggande stad"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Url för radarkartan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Använd anpassad url för radarkartan"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Använd metriska enheter"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Zonplats"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Använd metriska enheter istället för engelska enheter."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radarplats"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Väder för en stad"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Väderplatsinformation"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Staden som mateweather visar information om."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Väderplatsinformation."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Zonplats"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Platskoordinater"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Latitud och longitud för platsen uttryckt i DD-MM-SS[NS] DD-MM-SS [ÖV]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Använd anpassad url för radarkartan"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Om denna nyckel är sann hämtas en radarkarta från den plats som anges av nyckeln \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Url för radarkartan"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Den anpassade url där en radarkarta ska hämtas ifrån."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -463,11 +452,6 @@ msgstr "Nordväst"
 msgid "North - Northwest"
 msgstr "Nord-nordväst"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ogiltig"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Klar himmel"
diff --git a/po/ta.po b/po/ta.po
index 8181121..38e0df3 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -14,373 +14,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ta\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "சென்னை"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VOMM"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "13-00N 080-11E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "முன்னிருப்பு"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ஏலாதது"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "நாட்ஸ்"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort அளவு"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "மீ"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "மைல்"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "கீரின்விட்ஜ் நேரம்"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com இலிருந்து ராடார் படங்களை தருவிக்க தேவையான மூன்று இலக்க குறியீடு இந்த இணையத்திலிருந்து:  http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "நகரம் உள்ள தனிப்பட்ட மண்டலம் இவ்விடத்தில் கண்டவாறு:  http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "தகவலை தானாக இற்றைபடுத்து"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "சிறு நிரல்களே தானியங்கி சூழல்களின் புள்ளி விவரங்களைப் இற்றை படுத்துமாா என்பதைக் குறிப்பிடுகிறது."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "ராடார் வரைபடத்தை காட்டு"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "தொலைவு அலகு"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "இற்றைபடுத்தல் இடைவெளி"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ஒவ்வொரு மேலேற்றத்தின் போதும் ரேடார் வரைப்படத்தை அமை."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "தானாக இற்றைபடுத்தலின் இடைவேளை நொடிகளில்"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "உண்மையானால், \"ரேடார்\" விசை மூலம் குறிப்பிட்ட இடத்திலிருந்து ரேடார் வரைப்படம் தருவிக்கவும்"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "மெட்ரிக் அலகு முறையை உபயோகி"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "அட்சய ரேகை தீர்க ரேகையில் உங்கள் இடம் இவ்வாறு: DD-MM-SS[NS] DD-MM-SS[EW]."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ஆங்கில முறைக்கு பதில் மெட்ரிக் முறை அலகுகளைப் பயன்படுத்து"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "இடப்புள்ளிகள்"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "அருகிலுள்ள பெருநகரம்"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "தொலைவு அலகு"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "உபயோகிக்கத்தில் இல்லை"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "அழுத்தம் அலகு"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ராடார் இடம்"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "வேகம் அலகு"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "வெப்பநிலை அலகு"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "ஜிவெதர் தட்ப வெப்பத்தை காட்டும் நகரம்"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ரேடார் வரைப்படம் பெறப்படும் தனிப் பயன் யுஆர்எல்."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "உபயோகிக்கத்தில் இல்லை"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "தானாக இற்றைபடுத்தலின் இடைவேளை நொடிகளில்"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "ராடார் வரைபடத்தை காட்டு"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "அழுத்தத்தை அறிய பயன்படுத்தும் அலகு"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ஒவ்வொரு மேலேற்றத்தின் போதும் ரேடார் வரைப்படத்தை அமை."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "வெப்பத்தை அறிய பயன்படுத்தும் அலகு"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "காட்சிக்கு பயன்படுத்தும் அலகு"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "தட்பவெட்ப இடத்தின் தகவல். "
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "காற்றின் வேகத்தை அறிய பயன்படுத்தும் அலகு"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "தட்பவெட்ப இடத்தின் தகவல்."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "இற்றைபடுத்தல் இடைவெளி"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "தகவலை தானாக இற்றைபடுத்து"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "அருகிலுள்ள பெருநகரம்"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "ராடார் வரைபடத்திற்கான வலைமனை"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ராடார் வரைபடத்திற்கு தனிப்பயன் முகவரியைப் பயன்படுத்து"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "மெட்ரிக் அலகு முறையை உபயோகி"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "மண்டலத்தின் இடம்"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ஆங்கில முறைக்கு பதில் மெட்ரிக் முறை அலகுகளைப் பயன்படுத்து"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ராடார் இடம்"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "நகர வானிலை முன்னறிக்கை"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "தட்பவெட்ப இடத்தின் தகவல். "
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "ஜிவெதர் தட்ப வெப்பத்தை காட்டும் நகரம்"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "தட்பவெட்ப இடத்தின் தகவல்."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "மண்டலத்தின் இடம்"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "இடப்புள்ளிகள்"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "அட்சய ரேகை தீர்க ரேகையில் உங்கள் இடம் இவ்வாறு: DD-MM-SS[NS] DD-MM-SS[EW]."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ராடார் வரைபடத்திற்கு தனிப்பயன் முகவரியைப் பயன்படுத்து"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "உண்மையானால், \"ரேடார்\" விசை மூலம் குறிப்பிட்ட இடத்திலிருந்து ரேடார் வரைப்படம் தருவிக்கவும்"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "ராடார் வரைபடத்திற்கான வலைமனை"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ரேடார் வரைப்படம் பெறப்படும் தனிப் பயன் யுஆர்எல்."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -465,11 +454,6 @@ msgstr "வடமேற்கு"
 msgid "North - Northwest"
 msgstr "வடக்கு - வடமேற்கு"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "ஏலாதது"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "தெளிந்த வானம்"
diff --git a/po/te.po b/po/te.po
index ceba0c1..b33af21 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: te\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "DEFAULT_LOCATION"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "DEFAULT_CODE"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "DEFAULT_COORDINATES"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "అప్రమేయ"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "నిస్సారం"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "మీ/సె"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "కి.మీ./గం."
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "మైళ్ళు/గం."
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "నాట్స్"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "బ్యూఫోర్ట్ కొలత"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "కిలోమీటరు"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "DEFAULT_TEMP_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "DEFAULT_SPEED_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "DEFAULT_PRESSURE_UNIT"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "DEFAULT_DISTANCE_UNIT"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "గ్రీన్‌విచ్ మాన సమయం"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "weather.com నుండి రాడార్ మాప్‌లను పొందుటకు మూడు-అంకెల-పొడవు కోడ్, దీని నుండి from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in కనుగొనబడింది"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in నుండి కనుగొనబడినట్లు, పట్టణము కొరకు వొంటరి క్షేత్రము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "దత్తాంశమును స్వయంచాలకంగా తాజాపరచుము"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "వాతావరణ గణాంకాలను ఈ యాప్లెట్ స్వయంచాలకంగా తాజాపర్చాలో లేదో నిర్దేశించు."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "రాడార్ పటామును ప్రదర్శించుము"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "దూర ప్రమాణము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "తాజాపరచు విరామము"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "ప్రతి తాజాదనమునకు ఒక రాడార్ పటమును తెమ్ము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "స్వయంచాలక తాజాదనముల మధ్య సెకనులలో విరామము."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "నిజమైతే \"radar\" మీటచేత నిర్దేశించబడిన స్థానము నుంచి ఒక రాడార్ పటమును వెలికితీయుము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "మెట్రిక్ ప్రమాణములను ఉపయోగించుము"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "మీ స్థాన అక్షాంశము మరియు రేఖాంశములు DD-MM-SS[NS] DD-MM-SS[EW]లో వ్యక్తీకరించబడినవి."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ఆంగ్ల ప్రమాణములకు బదులుగా మెట్రిక్ ప్రమాణములను ఉపయోగించుము."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "స్థానపు నిరూపకాలు"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "దగ్గరలోని పట్టణము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "దూర ప్రమాణము"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "ఇక ఉపయోగించలేదు"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "పీడన ప్రమాణము"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "రాడార్ స్థానం"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "వేగ ప్రమాణము"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "ఉష్ణోగ్రత ప్రమాణము"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather సమాచారము ప్రదర్శించే పట్టణము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "ఒక రాడార్ పట వెలికితీతకు మలచిన url."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "ఇక ఉపయోగించలేదు"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "స్వయంచాలక తాజాదనముల మధ్య సెకనులలో విరామము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "రాడార్ పటామును ప్రదర్శించుము"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "పీడనమును కొలచుటకొరకు ప్రమాణము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "ప్రతి తాజాదనమునకు ఒక రాడార్ పటమును తెమ్ము."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "ఉష్ణోగ్రతను కొలచుటకొరకు ప్రమాణము."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "దృగ్గోచరతను కొలచుటకొరకు ప్రమాణము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "వాతావరణ స్థానపు సమాచారము"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "వాయు వేగమును కొలచుటకొరకు ప్రమాణము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "వాతావరణ స్థానపు సమాచారము."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "తాజాపరచు విరామము"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "దత్తాంశమును స్వయంచాలకంగా తాజాపరచుము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "దగ్గరలోని పట్టణము"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "రాడార్ పటము కొరకు url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "రాడార్ పటము కొరకు మలచిన urlను ఉపయోగించుము"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "మెట్రిక్ ప్రమాణములను ఉపయోగించుము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "క్షేత్రము స్థానము"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ఆంగ్ల ప్రమాణములకు బదులుగా మెట్రిక్ ప్రమాణములను ఉపయోగించుము."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "రాడార్ స్థానం"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "పట్టణము వాతావరణము"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "వాతావరణ స్థానపు సమాచారము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather సమాచారము ప్రదర్శించే పట్టణము."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "వాతావరణ స్థానపు సమాచారము."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "క్షేత్రము స్థానము"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "స్థానపు నిరూపకాలు"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "మీ స్థాన అక్షాంశము మరియు రేఖాంశములు DD-MM-SS[NS] DD-MM-SS[EW]లో వ్యక్తీకరించబడినవి."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "రాడార్ పటము కొరకు మలచిన urlను ఉపయోగించుము"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "నిజమైతే \"radar\" మీటచేత నిర్దేశించబడిన స్థానము నుంచి ఒక రాడార్ పటమును వెలికితీయుము"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "రాడార్ పటము కొరకు url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "ఒక రాడార్ పట వెలికితీతకు మలచిన url."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "వాయువ్య"
 msgid "North - Northwest"
 msgstr "ఉత్తరం - వాయువ్య"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "నిస్సారం"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "నిర్మలాకాశం"
diff --git a/po/th.po b/po/th.po
index e5f06b8..3fefba1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,373 +8,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/MATE/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "ดอนเมือง"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VTBD"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "13-55N 100-36E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "ปริยาย"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "เคลวิน"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "เซลเซียส"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "ฟาเรนไฮต์"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "ไม่ถูกต้อง"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "เมตร/วินาที"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "กม./ชม."
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "ไมล์/ชม."
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "นอต"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "มาตรา Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "กิโลปาสคาล"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "เฮกโตปาสคาล"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "มิลลิบาร์"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "มม.ปรอท"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "นิ้วปรอท"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "บรรยากาศ"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "เมตร"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "กิโลเมตร"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "ไมล์"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "atm"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "เวลามาตรฐานกรีนิช"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "รหัสตัวเลขสามหลักสำหรับดึงแผนที่เรดาร์จาก weather.com ซึ่งค้นหาได้จาก http://git.mate.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "เขตพื้นที่ (zone) ของเมือง ซึ่งค้นหาได้จาก http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "ปรับข้อมูลโดยอัตโนมัติ"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "กำหนดว่าแอพเพล็ตจะปรับข้อมูลสภาพอากาศโดยอัตโนมัติหรือไม่"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "แสดงแผนที่เรดาร์"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "หน่วยระยะทาง"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "ช่วงเวลาระหว่างการปรับข้อมูล"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "อ่านแผนที่เรดาร์ทุกครั้งที่ปรับข้อมูลสภาพอากาศ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "จำนวนวินาทีระหว่างการเรียกอ่านข้อมูลโดยอัตโนมัติ"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "ถ้าเป็นจริง จะอ่านแผนที่เรดาร์จากตำแหน่งที่กำหนดในคีย์ \"radar\""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "ใช้หน่วยเมตริก"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "ละติจูดและลองจิจูดของตำแหน่งที่ตั้งของคุณในรูปแบบ DD-MM-SS[NS] DD-MM-SS[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "ใช้หน่วยเมตริก ไม่ใช่หน่วยอังกฤษ"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "พิกัดตำแหน่งที่ตั้ง"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "เมืองข้างเคียง"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "หน่วยระยะทาง"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "เลิกใช้แล้ว"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "หน่วยความกดอากาศ:"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "ตำแหน่งเรดาร์"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "หน่วยความเร็ว"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "หน่วยอุณหภูมิ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "เมืองที่ mateweather แสดงข้อมูลรายงานสภาพอากาศ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "URL ตั้งเองสำหรับใช้อ่านแผนที่เรดาร์"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "เลิกใช้แล้ว"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "จำนวนวินาทีระหว่างการเรียกอ่านข้อมูลโดยอัตโนมัติ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "แสดงแผนที่เรดาร์"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "หน่วยความกดอากาศที่จะใช้"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "อ่านแผนที่เรดาร์ทุกครั้งที่ปรับข้อมูลสภาพอากาศ"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "หน่วยอุณหภูมิที่จะใช้"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "หน่วยทัศนวิสัยที่จะใช้"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "ตำแหน่งที่ตั้งที่จะรายงานสภาพอากาศ"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "หน่วยความเร็วลมที่จะใช้"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "ตำแหน่งที่ตั้งที่จะรายงานสภาพอากาศ"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "ช่วงเวลาระหว่างการปรับข้อมูล"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "ปรับข้อมูลโดยอัตโนมัติ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "เมืองข้างเคียง"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "URL สำหรับแผนที่เรดาร์"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "ใช้ URL กำหนดเองสำหรับแผนที่เรดาร์"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "ใช้หน่วยเมตริก"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "ตำแหน่งเขตพื้นที่"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "ใช้หน่วยเมตริก ไม่ใช่หน่วยอังกฤษ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "ตำแหน่งเรดาร์"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "เมืองที่รายงานสภาพอากาศ"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "ตำแหน่งที่ตั้งที่จะรายงานสภาพอากาศ"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "เมืองที่ mateweather แสดงข้อมูลรายงานสภาพอากาศ"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "ตำแหน่งที่ตั้งที่จะรายงานสภาพอากาศ"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "ตำแหน่งเขตพื้นที่"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "พิกัดตำแหน่งที่ตั้ง"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "ละติจูดและลองจิจูดของตำแหน่งที่ตั้งของคุณในรูปแบบ DD-MM-SS[NS] DD-MM-SS[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "ใช้ URL กำหนดเองสำหรับแผนที่เรดาร์"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "ถ้าเป็นจริง จะอ่านแผนที่เรดาร์จากตำแหน่งที่กำหนดในคีย์ \"radar\""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "URL สำหรับแผนที่เรดาร์"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "URL ตั้งเองสำหรับใช้อ่านแผนที่เรดาร์"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -459,11 +448,6 @@ msgstr "ตะวันตกเฉียงเหนือ"
 msgid "North - Northwest"
 msgstr "เหนือ - ตะวันตกเฉียงเหนือ"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "ไม่ถูกต้อง"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "ท้องฟ้าแจ่มใส"
diff --git a/po/tr.po b/po/tr.po
index cf538ea..249e880 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,386 +3,376 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Baris Cicek <[email protected]>, 2004, 2005, 2008, 2009.
+# Baris Cicek <[email protected]>, 2004-2005,2008-2009.
 # Emre Kadıoğlu <[email protected]>, 2005.
+#  <[email protected]>, 2013.
 #   <[email protected]>, 2012.
 # Sinan Imamoglu <[email protected]>, 2003.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-29 09:12+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-28 10:52+0000\n"
 "Last-Translator: mauron <[email protected]>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/MATE/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Ataturk"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "LTBA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "40-58N 028-49E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Öntanımlı"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Geçersiz"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "knot"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Beaufort ölçeği"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "mi"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "kPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "m"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "Greenwich Ortalama Zamanı"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Weather.com radar haritası almak için http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in konumundan bulunabilen üç basamaklı kod"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "http://git.gnome.org/cgit/libgweather/plain/data/Locations.xml.in içinde bulunabilen şehir için tekil alan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Bilgileri otomatik olarak güncelle"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Uygulamacığın hava durumu istatistiklerini kendiliğinden günceleyip güncellemeyeceğini belirtir."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Radar haritasını göster"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Uzaklık birimi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Güncelleme aralığı"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Her güncellemede radar haritası al."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Otomatik güncellemeler için, saniye cinsinden, aralık."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Eğer seçiliyse, \"radar\" anahtarında belirtilen konumdan radar haritası alır."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Metrik birimleri kullan"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Bulunduğunuz yer için DD-MM-SS[NS] DD-MM-SS [EW] şeklinde enlem ve boylam."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "İngiliz birimleri yerine metrik birimleri kullan."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Konum koordinatları"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'km'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Yakındaki şehir"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Uzaklık birimi"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Yakınlarda başkent gibi önemli bir bölge, http://git.gnome.org/browse/libgweather/plain/data/Locations.xml.in konumunda bulunduğu üzere."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "Kullanılacak görüş alanı birimi. Değerler: 'meters' (metre), 'km', 'miles' (mil)."
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Artık kullanılmıyor"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'hPa'"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Basınç birimi"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Radar konumu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "Kullanılacak basınç birimi. Değerler: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'."
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'km/h'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Hız birimi"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "Kullanılacak rüzgar hızı birimi. Değerler: 'm/s', 'km/h', 'mph' (saatte mil), 'knot', 'Beaufort scale' (Beaufort ölçeği)."
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Sıcaklık birimi"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Mateweather'in bilgisini gösterdiği şehir."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "Kullanılacak sıcaklık birimi. Değerler: 'Kelvin', 'Centigrade' (Santigrat), 'Fahrenheit'"
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Radar haritasının alınacağı özel url."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Artık kullanılmıyor"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Otomatik güncellemeler için, saniye cinsinden, aralık."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Radar haritasını göster"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Kullanılacak basınç birimi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Her güncellemede radar haritası al."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Kullanılacak sıcaklık birimi."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'Ataturk'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Hata durumu konum bilgisi"
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Kullanılacak görüş alanı birimi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Hava durumu konum bilgisi."
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Kullanılacak rüzgar hızı birimi."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'LTBA'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Yakındaki şehir"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Güncelleme aralığı"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in içinde bulunduğu gibi yakındaki ana alan, örneğin bir başkent"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'DEFAULT_ZONE'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Alan bilgisi"
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Bilgileri otomatik olarak güncelle"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in içinde bulunabilen şehir için tekil alan"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr "'DEFAULT_RADAR'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Radar konumu"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Radar haritası için url"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "Weather.com radar haritası almak için https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in konumundan bulunabilen üç basamaklı kod"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Radar haritası için özel adres kullan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "Şehir için hata durumu"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Metrik birimleri kullan"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Mateweather'in bilgisini gösterdiği şehir."
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "İngiliz birimleri yerine metrik birimleri kullan."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr "'40-58N 028-49E'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Konum koordinatları"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "Şehir için hata durumu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Bulunduğunuz yer için DD-MM-SS[NS] DD-MM-SS [EW] şeklinde enlem ve boylam."
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Hata durumu konum bilgisi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Radar haritası için özel adres kullan"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Hava durumu konum bilgisi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Eğer seçiliyse, \"radar\" anahtarında belirtilen konumdan radar haritası alır."
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Alan bilgisi"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Radar haritası için url"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Radar haritasının alınacağı özel url."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
-msgstr "Bilinmiyen"
+msgstr "Bilinmeyen"
 
 #. Translators: %d is an error code, and %s the error string
 #: ../libmateweather/weather-metar.c:504
@@ -462,11 +452,6 @@ msgstr "Kuzeybatı"
 msgid "North - Northwest"
 msgstr "Kuzey - Kuzeybatı"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Geçersiz"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Açık Gökyüzü"
@@ -552,7 +537,7 @@ msgstr "Hafif kar yağışı"
 
 #: ../libmateweather/weather.c:295
 msgid "Moderate snow"
-msgstr "Vasat kar yadışı"
+msgstr "Vasat kar yağışı"
 
 #: ../libmateweather/weather.c:295
 msgid "Heavy snow"
diff --git a/po/uk.po b/po/uk.po
index b61e72e..7c9824f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,373 +10,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-04-14 22:07+0000\n"
-"Last-Translator: Yarema aka Knedlyk <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:19+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/MATE/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Київ - Бориспіль"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "UKBB"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "50-20N 030-58E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Типово"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Помилковий"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "м/с"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "км/г"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "миль/год"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "вузол"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Шкала Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "кПа"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "ГПа"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "мбар"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "мм рт.ст."
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "дюймів рт.ст."
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "атм"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "км"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "міль"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mmHg"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "За Гринвічем"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Код з трьох цифр для отримання радарних мап з weather.com, відповідно до http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Унікальна зона міста, відповідно до http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Оновлювати дані автоматично"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Визначає, чи аплет погоди автоматично оновлює дані про погоду."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Показувати радарну мапу"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Одиниці відстані"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Період оновлення"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Запитувати радарну мапу з кожним оновленням."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Період між автоматичними оновленнями (в секундах)."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Якщо увімкнено, радарну мапу отримувати з місця, вказаного в ключі \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Метрична система"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "Широта та довгота вашого розташування у форматі DD-MM-SS[NS] DD-MM-SS[EW]"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Використовувати метричну систему."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Локальні координати"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Сусіднє місто"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Одиниці відстані"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "Біля основної зони, такої як місто-столиця, як знайдено на http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Більше не використовується"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Одиниці тиску"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Розташування радарної мапи"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Одиниці швидкості"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Одиниці температури"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Місто, про яке відображається інформація у mateweather."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Власна адреса для отримання радарної мапи."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Більше не використовується"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Період між автоматичними оновленнями (в секундах)."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Показувати радарну мапу"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Одиниці тиску."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Запитувати радарну мапу з кожним оновленням."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Одиниці температури."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Одиниці видимості."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Інформація про погоду у місцевості"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Одиниці швидкості вітру."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "інформація про погоду у місцевості."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Період оновлення"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Оновлювати дані автоматично"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Сусіднє місто"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Адреса радарної мапи"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Використовувати власну адресу радарної мапи."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Метрична система"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Розташування часового поясу"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Використовувати метричну систему."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Розташування радарної мапи"
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Погода для міста"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Інформація про погоду у місцевості"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Місто, про яке відображається інформація у mateweather."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "інформація про погоду у місцевості."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Розташування часового поясу"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Локальні координати"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "Широта та довгота вашого розташування у форматі DD-MM-SS[NS] DD-MM-SS[EW]"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Використовувати власну адресу радарної мапи."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Якщо увімкнено, радарну мапу отримувати з місця, вказаного в ключі \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Адреса радарної мапи"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Власна адреса для отримання радарної мапи."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -461,11 +450,6 @@ msgstr "Північно-західний"
 msgid "North - Northwest"
 msgstr "Північний - північно-західний"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Помилковий"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Безхмарно"
diff --git a/po/vi.po b/po/vi.po
index 27e1b16..db2b88f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,373 +7,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:15+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "T.P. Hồ Chí Minh"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VVTS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "10-49N 106-40E"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Mặc định"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Không hợp lệ"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "mét/giây"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "cây số/giờ"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "lý/giờ"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "hải lý"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "Tỷ lệ Beaufort"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "m"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "cây số"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "lý"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "kh/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Tự động cập nhật dữ liệu"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Xác định tiểu dụng tự động cập nhật thống kê thời tiết hay không."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Hiện bản đồ ra đa"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Đơn vị tầm"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Khoảng cập nhật"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Gọi bản đồ ra đa mỗi lần cập nhật."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Thời khoảng (theo giây) giữa hai lần cập nhật tự động."
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Nếu thật (true), thì gọi bản đồ ra đa từ địa điểm xác định bởi khóa \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Dùng đơn vị mét"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "10-49N 106-40E"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Dùng đơn vị mét thay vị đơn vị Anh."
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "Toạ độ địa điểm"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "Thành phố ở gần"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Đơn vị tầm"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Không còn dùng nữa"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Đơn vị áp suất"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "Địa điểm ra đa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Đơn vị tốc độ"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Đơn vị nhiệt độ"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "Thành phố cho đó mateweather hiển thị thông tin."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "Địa chỉ Mạng tự chọn nơi gọi bản đồ ra đa."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Không còn dùng nữa"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Thời khoảng (theo giây) giữa hai lần cập nhật tự động."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Hiện bản đồ ra đa"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Đơn vị cần dùng cho áp suất."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Gọi bản đồ ra đa mỗi lần cập nhật."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Đơn vị cần dùng cho nhiệt độ."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Đơn vị cần dùng cho tầm nhìn."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "Thông tin địa điểm thời tiết"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Đơn vị cần dùng cho tốc độ gió."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "Thông tin địa điểm thời tiết."
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Khoảng cập nhật"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Tự động cập nhật dữ liệu"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "Thành phố ở gần"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "Địa chỉ Mạng cho bản đồ ra đa"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Dùng địa chỉ Mạng tự chọn cho bản đồ ra đa"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Dùng đơn vị mét"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "Thông tin vùng"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Dùng đơn vị mét thay vị đơn vị Anh."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "Địa điểm ra đa"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "Thời tiết dành cho thành phố"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "Thông tin địa điểm thời tiết"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "Thành phố cho đó mateweather hiển thị thông tin."
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "Thông tin địa điểm thời tiết."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "Thông tin vùng"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "Toạ độ địa điểm"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "10-49N 106-40E"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Dùng địa chỉ Mạng tự chọn cho bản đồ ra đa"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Nếu thật (true), thì gọi bản đồ ra đa từ địa điểm xác định bởi khóa \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "Địa chỉ Mạng cho bản đồ ra đa"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "Địa chỉ Mạng tự chọn nơi gọi bản đồ ra đa."
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -458,11 +447,6 @@ msgstr "Bắc Tây"
 msgid "North - Northwest"
 msgstr "Bắc - Bắc Tây"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Không hợp lệ"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Trời trong"
diff --git a/po/wa.po b/po/wa.po
index a3e4a3c..bfbb4ea 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,372 +8,361 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: wa\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr ""
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr ""
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr ""
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr ""
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Nén valåbe"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr ""
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr ""
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr ""
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr ""
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr ""
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr ""
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr ""
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr ""
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr ""
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr ""
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
+#: ../libmateweather/mateweather-timezone.c:314
+msgid "Greenwich Mean Time"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
 msgstr ""
 
-#: ../libmateweather/mateweather-timezone.c:314
-msgid "Greenwich Mean Time"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:8
-msgid ""
-"Determines whether the applet automatically updates its weather statistics "
-"or not."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
 msgstr ""
 
 #: ../libmateweather/timezone-menu.c:277
@@ -459,11 +448,6 @@ msgstr "Nôrouwesse"
 msgid "North - Northwest"
 msgstr "Nôr - Nôrouwesse"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Nén valåbe"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Vûcir"
diff --git a/po/xh.po b/po/xh.po
index 14bfb41..c7d6c74 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,374 +8,363 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:14+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: xh\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "Johannesburg Airport"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "FAJS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "DEFAULT_RADAR"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "26-08S 028-14E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "Okumiselweyo"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr ""
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr ""
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr ""
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "Ayisebenzi"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "m/s"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "km/h"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "mph"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "ii-knots"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr ""
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "kPa"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "hPa"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "mb"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmgHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr ""
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr ""
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "km"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr ""
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "km/h"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "mb"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Hlaziya i-data ngokuzenzekelayo"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "Imisela ukuba mhlawumbi inkqutyana yekhompyutha izihlaziya ngokuzenzekelayo izitatistiki zayo zemozulu okanye ayizenzi njalo."
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "Bonisa imaphu ye-radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Hlaziya ikhefu"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "Iyunithi yomgama"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "Ikhefu, ngemizuzwana, phakathi kohlaziyo oluzenzekelayo."
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "Thatha imaphu ye-radar kuhlaziyo ngalunye."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "Sebenzisa iiyunithi ze-metric"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "Ukuba yinyani, fumana kwakhona ke imaphu ye-radar kwindawo ebalulwe liqhosha le \"radar\"."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "Sebenzisa iiyunithi ze-metric endaweni yeeyuni zesingesi."
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "Iyunithi yomgama"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "Ayisasetyenziswa"
-
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "Iyunithi yoxinzelelo"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "Iyunithi yesantya"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "Iyunithi yeqondo lobushushu"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "I-url ozenzele yona apho unokufumana kwakhona imaphu ye-radar."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "Ayisasetyenziswa"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "Ikhefu, ngemizuzwana, phakathi kohlaziyo oluzenzekelayo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "Bonisa imaphu ye-radar"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "Iyunithi yokusetyenziselwa uxinzelelo."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "Thatha imaphu ye-radar kuhlaziyo ngalunye."
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "Iyunithi yokusetyenziselwa iqondo lobushushu."
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "Iyunithi yokusetyenziselwa ukubonakala."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "Iyunithi yokusetyenziselwa isantya somoya."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "Hlaziya ikhefu"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "Hlaziya i-data ngokuzenzekelayo"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "i-Url yemaphu ye-radar"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "Sebenzisa i-url ozenzele yona kwimaphu ye-radar"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "Sebenzisa iiyunithi ze-metric"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "Sebenzisa iiyunithi ze-metric endaweni yeeyuni zesingesi."
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
 msgstr ""
 
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "Sebenzisa i-url ozenzele yona kwimaphu ye-radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "Ukuba yinyani, fumana kwakhona ke imaphu ye-radar kwindawo ebalulwe liqhosha le \"radar\"."
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "i-Url yemaphu ye-radar"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "I-url ozenzele yona apho unokufumana kwakhona imaphu ye-radar."
+
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
 msgid "Unknown"
@@ -459,11 +448,6 @@ msgstr "umNtlantshona"
 msgid "North - Northwest"
 msgstr "umNtla - umNtlantshona"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "Ayisebenzi"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "Isibhaka-bhaka esizolileyo"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd269fb..9459b2e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Aron Xu <[email protected]>, 2009.
+#   <[email protected]>, 2012.
 # Funda Wang <[email protected]>, 2003.
 # Liu Songhe <[email protected]>, 2003.
 # Ray Wang <[email protected]>, 2009.
@@ -15,373 +16,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/MATE/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "北京"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "ZBAA"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "------"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr "---"
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "39-54N 116-28E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "默认值"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "无效"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "米/秒"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "千米/小时"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "英里/小时"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "节"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "蒲福级"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "千帕"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "百帕"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "毫巴"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "毫米汞柱"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "英尺汞柱"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "大气压"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "米"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "千米"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "英里"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "千米/小时"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr "格林尼治标准时间(GMT)"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "从 weather.com 获取雷达地图的三位数代码，您可以在 http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in 找到"
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr "城市的唯一区域，您可以在 http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in 找到"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "自动更新数据"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "决定小程序是否自动更新天气统计。"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "显示雷达图"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "距离单位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "更新间隔"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "每次更新时取回雷达图。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "自动更新的间隔，以秒计。"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "如果为 true，则从“radar”键中指定的位置取回雷达图。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "使用公制单位"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "您所在位置的经纬度，格式为“度-分-秒[NS] 度-分-秒[EW]”"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "使用公制单位，而不是英制单位。"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "位置坐标"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "临近城市"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "距离单位"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "不再使用"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "气压单位"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "雷达位置"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "速度单位"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "温度单位"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather 显示信息的城市。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "收取雷达图的自定义 URL。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "不再使用"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "自动更新的间隔，以秒计。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "显示雷达图"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "要使用的压力单位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "每次更新时取回雷达图。"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "要使用的压力单位。"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "要使用的能见度单位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "天气位置信息"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "要使用的风速单位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "天气位置信息。"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "更新间隔"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "自动更新数据"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "临近城市"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "雷达图的 URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "对雷达图使用自定义地址"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "使用公制单位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "区域位置"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "使用公制单位，而不是英制单位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "雷达位置"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "城市天气"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "天气位置信息"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather 显示信息的城市。"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "天气位置信息。"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "区域位置"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "位置坐标"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "您所在位置的经纬度，格式为“度-分-秒[NS] 度-分-秒[EW]”"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "对雷达图使用自定义地址"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "如果为 true，则从“radar”键中指定的位置取回雷达图。"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "雷达图的 URL"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "收取雷达图的自定义 URL。"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -466,11 +456,6 @@ msgstr "西北"
 msgid "North - Northwest"
 msgstr "西北偏北"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "无效"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "晴"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5362e24..b603d8d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,373 +9,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:16+0000\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-08 13:20+0000\n"
 "Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/MATE/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_HK\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "香港國際機場"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "VHHH"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
-
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "22-20N 114-11E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "預設"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "無效"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "米/秒"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "公里/小時"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "海里/小時"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "節"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "蒲福氏風級"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "千帕斯卡"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "百帕斯卡"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "毫巴"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "米"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "公里"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "哩"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "mph"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "自動更新資料"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "決定面板程式會否自動更新天氣資料。"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "顯示雷達圖"
-
-#: ../libmateweather/mateweather.schemas.in.h:10
-msgid "Distance unit"
-msgstr "距離單位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "更新周期"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "每次更新時都擷取雷達圖。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "每隔指定時間（分鐘）自動更新。"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
-msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "如設定為‘true’，則從“radar”設定鍵中所指定的位置擷取雷達圖。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "使用公制單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
-msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "你所在的位置，以 DD-MM-SS[經度] DD-MM-SS[緯度] 表示。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "使用公制單位而不用英制單位。"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "位置坐標"
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "附近城市"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
+msgid "Distance unit"
+msgstr "距離單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
-msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
 msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:17
-msgid "Not used anymore"
-msgstr "這項設定已不再使用"
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:18
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
 msgid "Pressure unit"
 msgstr "氣壓單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "雷達位置"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
+msgid ""
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr ""
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:20
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
 msgid "Speed unit"
 msgstr "速度單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
+msgid ""
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr ""
+
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
 msgid "Temperature unit"
 msgstr "溫度單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather 顯示的城市資訊"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
+msgid ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "自行指定在哪個 URL 擷取雷達圖"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
+msgid "Not used anymore"
+msgstr "這項設定已不再使用"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "每隔指定時間（分鐘）自動更新。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "顯示雷達圖"
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "氣壓所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "每次更新時都擷取雷達圖。"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "溫度所使用的單位。"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "能見度所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "天氣位置資訊"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "風速所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "天氣位置資訊。"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "更新周期"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "自動更新資料"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "附近城市"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "雷達圖的 URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:32
-msgid "Use custom url for the radar map"
-msgstr "使用自行指定的 URL 作為雷達圖位置"
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "使用公制單位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "區域位置"
 
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "使用公制單位而不用英制單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr ""
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "雷達位置"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:35
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
 msgid "Weather for a city"
 msgstr "城市的天氣"
 
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "天氣位置資訊"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather 顯示的城市資訊"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "天氣位置資訊。"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr ""
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "區域位置"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "位置坐標"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "你所在的位置，以 DD-MM-SS[經度] DD-MM-SS[緯度] 表示。"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
+msgid "Use custom url for the radar map"
+msgstr "使用自行指定的 URL 作為雷達圖位置"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "如設定為‘true’，則從“radar”設定鍵中所指定的位置擷取雷達圖。"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "雷達圖的 URL"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "自行指定在哪個 URL 擷取雷達圖"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +449,6 @@ msgstr "西北"
 msgid "North - Northwest"
 msgstr "西北偏北"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "無效"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "天氣晴朗"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2cac8ef..518bc55 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,378 +4,369 @@
 # 
 # Translators:
 # Jing-Jong Shyue <[email protected]>, , 2000.
+# Jing-Jong Shyue <[email protected]>, , 2000.
+# Wei-Lun Chao <[email protected]>, 2012-2013.
 # Yuan-Chung Cheng <[email protected]>, 1999.
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-02-23 10:11+0100\n"
-"PO-Revision-Date: 2012-02-23 09:18+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"POT-Creation-Date: 2013-03-08 14:18+0100\n"
+"PO-Revision-Date: 2013-03-18 21:16+0000\n"
+"Last-Translator: Wei-Lun Chao <[email protected]>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/MATE/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. TRANSLATOR: Change this to the default location name,
-#. * used when you first start the Weather Applet. This is
-#. * the common localised name that corresponds to
-#. * the location code (DEFAULT_CODE) you will put on the next message
-#. * For example, for the Greek locale, we set this to "Athens", the
-#. * capital city and we write it in Greek. It's important to translate
-#. * this name.
-#. *
-#. * If you do not require a DEFAULT_LOCATION, set this to
-#. * "DEFAULT_LOCATION".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:212
-#: ../libmateweather/mateweather-mateconf.c:213
-#: ../libmateweather/mateweather.schemas.in.h:5
-msgid "DEFAULT_LOCATION"
-msgstr "松山/臺北"
-
-#. TRANSLATOR: Change this to the code of your default location that
-#. * corresponds to the DEFAULT_LOCATION name you put above. This is
-#. * normally a four-letter (ICAO) code and can be found in
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * NB. The web page is over 1.7MB in size.
-#. * Pick a default location like a capital city so that it would be ok
-#. * for more of your users. For example, for Greek, we use "LGAV" for
-#. * the capital city, Athens.
-#. *
-#. * If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:232
-#: ../libmateweather/mateweather-mateconf.c:233
-#: ../libmateweather/mateweather.schemas.in.h:3
-msgid "DEFAULT_CODE"
-msgstr "RCSS"
-
-#. TRANSLATOR: Change this to the zone of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have zones while the rest do not.
-#. * Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any zone you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a zone, set this to
-#. * "DEFAULT_ZONE".
-#. 
-#: ../libmateweather/mateweather-mateconf.c:252
-#: ../libmateweather/mateweather-mateconf.c:253
-#: ../libmateweather/mateweather.schemas.in.h:7
-msgid "DEFAULT_ZONE"
-msgstr "DEFAULT_ZONE"
-
-#. TRANSLATOR: Change this to the radar of your default location that
-#. * corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put above.
-#. * Normally, US and Canada locations have radar names while the rest do
-#. * not. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any radar you put here must also be present in the Locations.xml
-#. * file.
-#. *
-#. * If your default location does not have a radar, set this to " "
-#. * (or space).
-#. * If you do not have a default location, set this to DEFAULT_RADAR.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:273
-#: ../libmateweather/mateweather-mateconf.c:274
-#: ../libmateweather/mateweather.schemas.in.h:6
-msgid "DEFAULT_RADAR"
-msgstr " "
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANSLATOR: Change this to the coordinates of your default location
-#. * that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
-#. * above. Check
-#. * http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in
-#. * as any coordinates you put here must also be present in the
-#. * Locations.xml file.
-#. *
-#. * If your default location does not have known coordinates, set this
-#. * to " " (or space).
-#. * If you do not have a default location, set this to
-#. * DEFAULT_COORDINATES.
-#. 
-#: ../libmateweather/mateweather-mateconf.c:294
-#: ../libmateweather/mateweather-mateconf.c:295
-#: ../libmateweather/mateweather.schemas.in.h:4
-msgid "DEFAULT_COORDINATES"
-msgstr "25-04N 121-33E"
-
-#: ../libmateweather/mateweather-prefs.c:34
-#: ../libmateweather/mateweather-prefs.c:45
-#: ../libmateweather/mateweather-prefs.c:60
-#: ../libmateweather/mateweather-prefs.c:77
+#: ../libmateweather/mateweather-prefs.c:86
+#: ../libmateweather/mateweather-prefs.c:105
+#: ../libmateweather/mateweather-prefs.c:130
+#: ../libmateweather/mateweather-prefs.c:158
 msgid "Default"
 msgstr "預設"
 
 #. translators: Kelvin
-#: ../libmateweather/mateweather-prefs.c:36
+#: ../libmateweather/mateweather-prefs.c:89
 msgid "K"
 msgstr "K"
 
 #. translators: Celsius
-#: ../libmateweather/mateweather-prefs.c:38
+#: ../libmateweather/mateweather-prefs.c:92
 msgid "C"
 msgstr "C"
 
 #. translators: Fahrenheit
-#: ../libmateweather/mateweather-prefs.c:40
+#: ../libmateweather/mateweather-prefs.c:95
 msgid "F"
 msgstr "F"
 
+#: ../libmateweather/mateweather-prefs.c:97
+#: ../libmateweather/mateweather-prefs.c:122
+#: ../libmateweather/mateweather-prefs.c:150
+#: ../libmateweather/mateweather-prefs.c:169 ../libmateweather/weather.c:243
+#: ../libmateweather/weather.c:260 ../libmateweather/weather.c:332
+msgid "Invalid"
+msgstr "無效"
+
 #. translators: meters per second
-#: ../libmateweather/mateweather-prefs.c:47
+#: ../libmateweather/mateweather-prefs.c:108
 msgid "m/s"
 msgstr "公尺/秒"
 
 #. translators: kilometers per hour
-#: ../libmateweather/mateweather-prefs.c:49
+#: ../libmateweather/mateweather-prefs.c:111
 msgid "km/h"
 msgstr "公里/小時"
 
 #. translators: miles per hour
-#: ../libmateweather/mateweather-prefs.c:51
+#: ../libmateweather/mateweather-prefs.c:114
 msgid "mph"
 msgstr "浬/小時"
 
 #. translators: knots (speed unit)
-#: ../libmateweather/mateweather-prefs.c:53
+#: ../libmateweather/mateweather-prefs.c:117
 msgid "knots"
 msgstr "節"
 
 #. translators: wind speed
-#: ../libmateweather/mateweather-prefs.c:55
+#: ../libmateweather/mateweather-prefs.c:120
 msgid "Beaufort scale"
 msgstr "蒲福氏風級"
 
 #. translators: kilopascals
-#: ../libmateweather/mateweather-prefs.c:62
+#: ../libmateweather/mateweather-prefs.c:133
 msgid "kPa"
 msgstr "千帕"
 
 #. translators: hectopascals
-#: ../libmateweather/mateweather-prefs.c:64
+#: ../libmateweather/mateweather-prefs.c:136
 msgid "hPa"
 msgstr "百帕"
 
 #. translators: millibars
-#: ../libmateweather/mateweather-prefs.c:66
+#: ../libmateweather/mateweather-prefs.c:139
 msgid "mb"
 msgstr "毫巴"
 
 #. translators: millimeters of mercury
-#: ../libmateweather/mateweather-prefs.c:68
+#: ../libmateweather/mateweather-prefs.c:142
 msgid "mmHg"
 msgstr "mmHg"
 
 #. translators: inches of mercury
-#: ../libmateweather/mateweather-prefs.c:70
+#: ../libmateweather/mateweather-prefs.c:145
 msgid "inHg"
 msgstr "inHg"
 
 #. translators: atmosphere
-#: ../libmateweather/mateweather-prefs.c:72
+#: ../libmateweather/mateweather-prefs.c:148
 msgid "atm"
 msgstr "atm"
 
 #. translators: meters
-#: ../libmateweather/mateweather-prefs.c:79
+#: ../libmateweather/mateweather-prefs.c:161
 msgid "m"
 msgstr "米"
 
 #. translators: kilometers
-#: ../libmateweather/mateweather-prefs.c:81
+#: ../libmateweather/mateweather-prefs.c:164
 msgid "km"
 msgstr "公里"
 
 #. translators: miles
-#: ../libmateweather/mateweather-prefs.c:83
+#: ../libmateweather/mateweather-prefs.c:167
 msgid "mi"
 msgstr "哩"
 
-#. TRANSLATOR: This is the default unit to use for temperature measurements.
-#. Valid values are: "K" (Kelvin), "C" (Celsius) and "F" (Fahrenheit)
-#: ../libmateweather/mateweather-prefs.c:103
-#: ../libmateweather/mateweather-prefs.c:111
-msgid "DEFAULT_TEMP_UNIT"
-msgstr "C"
-
-#. TRANSLATOR: This is the default unit to use for wind speed.
-#. Valid values are: "m/s" (meters per second), "km/h" (kilometers per hour),
-#. "mph" (miles per hour) and "knots"
-#: ../libmateweather/mateweather-prefs.c:141
-#: ../libmateweather/mateweather-prefs.c:151
-msgid "DEFAULT_SPEED_UNIT"
-msgstr "m/s"
-
-#. TRANSLATOR: This is the default unit to use for atmospheric pressure.
-#. Valid values are: "kPa" (kiloPascals), "hPa" (hectoPascals),
-#. "mb" (millibars), "mmHg" (millimeters of mercury),
-#. "inHg" (inches of mercury) and "atm" (atmosphere)
-#: ../libmateweather/mateweather-prefs.c:183
-#: ../libmateweather/mateweather-prefs.c:194
-msgid "DEFAULT_PRESSURE_UNIT"
-msgstr "hPa"
-
-#. TRANSLATOR: This is the default unit to use for visibility distance.
-#. Valid values are: "m" (meters), "km" (kilometers) and "mi" (miles)
-#: ../libmateweather/mateweather-prefs.c:224
-#: ../libmateweather/mateweather-prefs.c:233
-msgid "DEFAULT_DISTANCE_UNIT"
-msgstr "km"
-
 #: ../libmateweather/mateweather-timezone.c:314
 msgid "Greenwich Mean Time"
-msgstr ""
+msgstr "格林威治標準時間"
 
-#: ../libmateweather/mateweather.schemas.in.h:1
-msgid ""
-"A three-digit-long code for retrieving radar maps from weather.com, found "
-"from http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
-
-#: ../libmateweather/mateweather.schemas.in.h:2
-msgid ""
-"A unique zone for the city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "自動更新資料"
 
-#: ../libmateweather/mateweather.schemas.in.h:8
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
 msgstr "決定面板程式會否自動更新天氣資料。"
 
-#: ../libmateweather/mateweather.schemas.in.h:9
-msgid "Display radar map"
-msgstr "顯示雷達圖"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "更新周期"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "每隔指定時間（分鐘）自動更新。"
 
-#: ../libmateweather/mateweather.schemas.in.h:10
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:5
+msgid "Use metric units"
+msgstr "使用公制單位"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:6
+msgid "Use metric units instead of english units."
+msgstr "使用公制單位而不用英制單位。"
+
+#. TRANSLATORS: pick a default distance unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:9
+msgid "'miles'"
+msgstr "'km'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:10
 msgid "Distance unit"
 msgstr "距離單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:11
-msgid "Fetch a radar map on each update."
-msgstr "每次更新時都擷取雷達圖。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:11
+msgid "The unit to use for visibility. Values: 'meters', 'km' ,'miles'."
+msgstr "單位以使用用於可視性。值：'meters', 'km' ,'miles'。"
+
+#. TRANSLATORS: pick a default pressure unit for your locale, see key
+#. description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:14
+msgid "'inHg'"
+msgstr "'mmHg'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:15
+msgid "Pressure unit"
+msgstr "氣壓單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:12
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:16
 msgid ""
-"If true, then retrieve a radar map from a location specified by the "
-"\"radar\" key."
-msgstr "如設定為‘true’，則從“radar”設定鍵中所指定的位置擷取雷達圖。"
+"The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, "
+"'atm'."
+msgstr "單位以使用用於壓力。值：'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'。"
+
+#. TRANSLATORS: pick a default speed unit for your locale, see key description
+#. for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:19
+msgid "'knots'"
+msgstr "'km/h'"
 
-#: ../libmateweather/mateweather.schemas.in.h:13
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:20
+msgid "Speed unit"
+msgstr "速度單位"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:21
 msgid ""
-"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
-"SS[EW]."
-msgstr "您所在的位置，以 DD-MM-SS[經度] DD-MM-SS[緯度] 表示。"
+"The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', "
+"'Beaufort scale'."
+msgstr "單位以使用用於旋緊速度。值：'m/s', 'km/h, 'mph', 'knots', 'Beaufort scale'。"
 
-#: ../libmateweather/mateweather.schemas.in.h:14
-msgid "Location coordinates"
-msgstr "位置坐標"
+#. TRANSLATORS: pick a temperature unit that should be used by default in your
+#. locale, see key description for valid values; values must be quoted
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:24
+msgid "'Fahrenheit'"
+msgstr "'Centigrade'"
 
-#: ../libmateweather/mateweather.schemas.in.h:15
-msgid "Nearby city"
-msgstr "附近城市"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:25
+msgid "Temperature unit"
+msgstr "溫度單位"
 
-#: ../libmateweather/mateweather.schemas.in.h:16
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:26
 msgid ""
-"Nearby major zone, such as a capital city, as found from "
-"http://git.gnome.org/cgit/libmateweather/plain/data/Locations.xml.in"
-msgstr ""
+"The unit to use for temperature. Values: 'Kelvin', 'Centigrade', "
+"'Fahrenheit'."
+msgstr "單位以使用用於溫度。值：'Kelvin', 'Centigrade', 'Fahrenheit'。"
 
-#: ../libmateweather/mateweather.schemas.in.h:17
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:27
 msgid "Not used anymore"
 msgstr "這項設定已不再使用"
 
-#: ../libmateweather/mateweather.schemas.in.h:18
-msgid "Pressure unit"
-msgstr "氣壓單位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:28
+msgid "Display radar map"
+msgstr "顯示雷達圖"
 
-#: ../libmateweather/mateweather.schemas.in.h:19
-msgid "Radar location"
-msgstr "雷達位置"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:29
+msgid "Fetch a radar map on each update."
+msgstr "每次更新時都擷取雷達圖。"
 
-#: ../libmateweather/mateweather.schemas.in.h:20
-msgid "Speed unit"
-msgstr "速度單位"
+#. TRANSLATORS: Change this to the default location name, used
+#. when you first start the Weather Applet. This is the common
+#. localised name that corresponds to the location code
+#. (DEFAULT_CODE) you will put on the next message. For example, for
+#. the Greek locale, we set this to "Athens", the capital city and we
+#. write it in Greek. It's important to translate this name. If you
+#. do not require a DEFAULT_LOCATION, set this to
+#. "DEFAULT_LOCATION".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:38
+msgid "'DEFAULT_LOCATION'"
+msgstr "'臺北'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:39
+msgid "Weather location information"
+msgstr "天氣位置資訊"
 
-#: ../libmateweather/mateweather.schemas.in.h:21
-msgid "Temperature unit"
-msgstr "溫度單位"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:40
+msgid "Weather location information."
+msgstr "天氣位置資訊。"
 
-#: ../libmateweather/mateweather.schemas.in.h:22
-msgid "The city that mateweather displays information for."
-msgstr "mateweather 顯示的城市資訊"
+#. TRANSLATORS: Change this to the code of your default location
+#. that corresponds to the DEFAULT_LOCATION name you put above. This
+#. is normally a four-letter (ICAO) code and can be found in
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in.
+#. NB. The web page is over 1.7MB in size. Pick a default location
+#. like a capital city so that it would be ok for more of your users.
+#. For example, for Greek, we use "LGAV" for the capital city, Athens.
+#. If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:49
+msgid "'DEFAULT_CODE'"
+msgstr "'RCSS'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:50
+msgid "Nearby city"
+msgstr "附近城市"
 
-#: ../libmateweather/mateweather.schemas.in.h:23
-msgid "The custom url from where to retrieve a radar map."
-msgstr "自行指定在哪個 URL 擷取雷達圖"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:51
+msgid ""
+"Nearby major zone, such as a capital city, as found from "
+"https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "從 https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in 所得到附近諸如首都的主要地區"
+
+#. TRANSLATORS: Change this to the zone of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have zones while the rest
+#. do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any zone you put here must also be present in the Locations.xml
+#. file. If your default location does not have a zone, set this to
+#. "DEFAULT_ZONE".
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:60
+msgid "'DEFAULT_ZONE'"
+msgstr "'Asia/Taipei'"
+
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:61
+msgid "Zone location"
+msgstr "時區位置"
 
-#: ../libmateweather/mateweather.schemas.in.h:24
-msgid "The interval, in seconds, between automatic updates."
-msgstr "每隔指定時間（分鐘）自動更新。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:62
+msgid ""
+"A unique zone for the city, as found from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "從 https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in 所得到該城市的時區"
+
+#. TRANSLATORS: Change this to the radar of your default location
+#. that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE you put
+#. above. Normally, US and Canada locations have radar names while the
+#. rest do not. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any radar you put here must also be present in the Locations.xml
+#. file. If your default location does not have a radar, set this to
+#. " " (or space).
+#. If you do not have a default location, set this to DEFAULT_RADAR.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:72
+msgid "'DEFAULT_RADAR'"
+msgstr " "
 
-#: ../libmateweather/mateweather.schemas.in.h:25
-msgid "The unit to use for pressure."
-msgstr "氣壓所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:73
+msgid "Radar location"
+msgstr "雷達位置"
 
-#: ../libmateweather/mateweather.schemas.in.h:26
-msgid "The unit to use for temperature."
-msgstr "溫度所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:74
+msgid ""
+"A three-digit-long code for retrieving radar maps from weather.com, found "
+"from https://raw.github.com/mate-"
+"desktop/libmateweather/master/data/Locations.xml.in"
+msgstr "three-digit-long 編碼用於取回 radar 映射從天氣.com，從 https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in 所得到用於自 weather.com 擷取雷達圖的三位數字編碼"
 
-#: ../libmateweather/mateweather.schemas.in.h:27
-msgid "The unit to use for visibility."
-msgstr "能見度所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:75
+msgid "Weather for a city"
+msgstr "城市的天氣"
 
-#: ../libmateweather/mateweather.schemas.in.h:28
-msgid "The unit to use for wind speed."
-msgstr "風速所使用的單位。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:76
+msgid "The city that mateweather displays information for."
+msgstr "mateweather 顯示的城市資訊"
 
-#: ../libmateweather/mateweather.schemas.in.h:29
-msgid "Update interval"
-msgstr "更新周期"
+#. TRANSLATORS: Change this to the coordinates of your default
+#. location that corresponds to the DEFAULT_LOCATION and DEFAULT_CODE
+#. you put above. Check
+#. https://github.com/mate-
+#. desktop/libmateweather/blob/master/data/Locations.xml.in
+#. as any coordinates you put here must also be present in the
+#. Locations.xml file. If your default location does not have known
+#. coordinates, set this to " " (or space). If you do not have a
+#. default location, set this to DEFAULT_COORDINATES.
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:85
+msgid "'DEFAULT_COORDINATES'"
+msgstr " "
 
-#: ../libmateweather/mateweather.schemas.in.h:30
-msgid "Update the data automatically"
-msgstr "自動更新資料"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:86
+msgid "Location coordinates"
+msgstr "位置坐標"
 
-#: ../libmateweather/mateweather.schemas.in.h:31
-msgid "Url for the radar map"
-msgstr "雷達圖的 URL"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:87
+msgid ""
+"Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+"SS[EW]."
+msgstr "您所在的位置，以 DD-MM-SS[經度] DD-MM-SS[緯度] 表示。"
 
-#: ../libmateweather/mateweather.schemas.in.h:32
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:88
 msgid "Use custom url for the radar map"
 msgstr "使用自行指定的 URL 作為雷達圖位置"
 
-#: ../libmateweather/mateweather.schemas.in.h:33
-msgid "Use metric units"
-msgstr "使用公制單位"
-
-#: ../libmateweather/mateweather.schemas.in.h:34
-msgid "Use metric units instead of english units."
-msgstr "使用公制單位而不用英制單位。"
-
-#: ../libmateweather/mateweather.schemas.in.h:35
-msgid "Weather for a city"
-msgstr "城市的天氣"
-
-#: ../libmateweather/mateweather.schemas.in.h:36
-msgid "Weather location information"
-msgstr "天氣位置資訊"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:89
+msgid ""
+"If true, then retrieve a radar map from a location specified by the "
+"\"radar\" key."
+msgstr "如設定為‘true’，則從“radar”設定鍵中所指定的位置擷取雷達圖。"
 
-#: ../libmateweather/mateweather.schemas.in.h:37
-msgid "Weather location information."
-msgstr "天氣位置資訊。"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:90
+msgid "Url for the radar map"
+msgstr "雷達圖的 URL"
 
-#: ../libmateweather/mateweather.schemas.in.h:38
-msgid "Zone location"
-msgstr "區域位置"
+#: ../libmateweather/org.mate.weather.gschema.xml.in.in.h:91
+msgid "The custom url from where to retrieve a radar map."
+msgstr "自行指定在哪個 URL 擷取雷達圖"
 
 #: ../libmateweather/timezone-menu.c:277
 msgctxt "timezone"
@@ -460,11 +451,6 @@ msgstr "西北"
 msgid "North - Northwest"
 msgstr "北北西"
 
-#: ../libmateweather/weather.c:243 ../libmateweather/weather.c:260
-#: ../libmateweather/weather.c:332
-msgid "Invalid"
-msgstr "無效"
-
 #: ../libmateweather/weather.c:249
 msgid "Clear Sky"
 msgstr "天氣晴朗"
@@ -674,7 +660,7 @@ msgstr "局部地區性有霧"
 
 #: ../libmateweather/weather.c:303
 msgid "Partial fog"
-msgstr "部份方向有霧"
+msgstr "部分方向有霧"
 
 #: ../libmateweather/weather.c:303
 msgid "Freezing fog"
@@ -889,13 +875,13 @@ msgstr "%s / %s"
 #: ../libmateweather/weather.c:961
 #, c-format
 msgid "%.2f inHg"
-msgstr "%.2f inHg"
+msgstr "%.2f 英吋汞柱"
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
 #: ../libmateweather/weather.c:965
 #, c-format
 msgid "%.1f mmHg"
-msgstr "%.1f mmHg"
+msgstr "%.1f 毫米汞柱"
 
 #. TRANSLATOR: This is pressure in kiloPascals
 #: ../libmateweather/weather.c:969
@@ -919,7 +905,7 @@ msgstr "%.2f 亳巴"
 #: ../libmateweather/weather.c:981
 #, c-format
 msgid "%.3f atm"
-msgstr "%.3f atm"
+msgstr "%.3f 大氣壓"
 
 #. TRANSLATOR: This is the visibility in miles
 #: ../libmateweather/weather.c:1009