[Xfce4-commits] <xfce4-weather-plugin:master> Regenerate PO files.

Harald Judt noreply at xfce.org
Fri Aug 3 02:06:02 CEST 2012


Updating branch refs/heads/master
         to 80c912738bc3975c524950efab80de2e0bbd1b7f (commit)
       from 94cbe658f7fdacc60ba4fa31505308238fc5cdb3 (commit)

commit 80c912738bc3975c524950efab80de2e0bbd1b7f
Author: Harald Judt <h.judt at gmx.at>
Date:   Fri Aug 3 02:00:34 2012 +0200

    Regenerate PO files.

 po/ar.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/ast.po   |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/be.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/ca.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/cs.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/da.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/de.po    |  565 ++++++++++++++++++++++++++++++++++++++---------------------
 po/el.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/en_GB.po |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/es.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/eu.po    |  553 ++++++++++++++++++++++++++++++++++++++--------------------
 po/fi.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/fr.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/gl.po    |  547 +++++++++++++++++++++++++++++++++++++--------------------
 po/he.po    |  549 ++++++++++++++++++++++++++++++++++++++--------------------
 po/hr.po    |  549 +++++++++++++++++++++++++++++++++++++--------------------
 po/hu.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/id.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/it.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/ja.po    |  550 ++++++++++++++++++++++++++++++++++++++-------------------
 po/ko.po    |  562 ++++++++++++++++++++++++++++++++++++++--------------------
 po/lt.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/lv.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/nb.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/nl.po    |  562 +++++++++++++++++++++++++++++++++++++++--------------------
 po/nn.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/pa.po    |  539 +++++++++++++++++++++++++++++++++++++-------------------
 po/pl.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/pt.po    |  559 ++++++++++++++++++++++++++++++++++++++--------------------
 po/pt_BR.po |  549 ++++++++++++++++++++++++++++++++++++++--------------------
 po/ru.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/sk.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/sq.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/sv.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/te.po    |  537 +++++++++++++++++++++++++++++++++++++-------------------
 po/tr.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/ug.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/uk.po    |  566 ++++++++++++++++++++++++++++++++++++++---------------------
 po/ur.po    |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/ur_PK.po |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/zh_CN.po |  548 +++++++++++++++++++++++++++++++++++++--------------------
 po/zh_TW.po |  554 ++++++++++++++++++++++++++++++++++++++--------------------
 42 files changed, 15203 insertions(+), 7882 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index d1e6215..3ffa87c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-02-03 11:19+0300\n"
 "Last-Translator: mohammad <malham1 at gmail.com>\n"
 "Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n"
@@ -16,328 +16,401 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "هدوء"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "هدوء"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "لا يمكن تحميل بيانات الطقس"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "غير قادر على فتح المسار التالي: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "تحديث الطقس"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_النشرة الجوية"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "درجة الحرارة (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "ضغط الغلاف الجوي (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "سرعة الرياح (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "اتجاه الرياح (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "اتجاه الرياح (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "الرطوبة (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "غيوم"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "غيم متغير"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "غائم جزئيا"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "غيوم"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>هطول الأمطار</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "غير محدد"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "الرجاء إدخال إعدادات الوكيل"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "الرجاء إدخال إعدادات الوكيل"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "الكشف عن..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "وحدة القياس:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "ملكي"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "متري"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "الموقع:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "تغيير..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "الملقم الوكيل:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "استخدام ملقم وكيل"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "الكشف التلقائي عن البيئة"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "تسميات للعرض"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "تحريك النتقالات بين التسميات"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "كم"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "ه‍.باسكال"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "ميل/س"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "كم/ساعة"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "في"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "فشل في الحصول على اسم المضيف %s. إعادة المحاولة في %d ثانية."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "فشل في فتح مأخذ التوصيل (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "فشل في إنشاء اتصال مع المضيف (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "فشل في إرسال الطلب (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "فشل في الحصول على البيانات (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "طول المحتوى السالب"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "غير قادر على الكشف عن طول المحتوى."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "لا يوجد محتوى وارد."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "النتائج"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "البحث..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "بحث رمز موقع الطقس"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "أدخل اسم المدينة أو الرمز البريدي"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "تقرير الطقس عن: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "درجة الحرارة\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "درجة الحرارة"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "الرياح\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "سرعة"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "الاتجاه"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>هطول الأمطار</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>هطول الأمطار</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,303 +574,346 @@ msgstr ""
 "\n"
 "الضغط الجوي\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "الضغط"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "الرّطوبة"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "غيوم"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "ضباب"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "غيوم"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "غيوم"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "ليلة: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "تقرير الطقس عن: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "الرجاء إدخال إعدادات الوكيل"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "تفاصيل"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "جنوب-جنوب غربي"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "جنوب غربي"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "غربي جنوبي غربي"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "غربي شمالي غربي"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "شمال غربي"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "شمال إلى شمال غربي"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "شمال إلى شمال شرقي"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "شمال شرقي"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "شرقي شمالى شرقي"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "شرقي جنوبي شرقي"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "جنوب شرقي"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "جنوب-جنوب شرقي"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "هدوء"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "مشمس"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "صافي"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "غائم جزئيا"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "غائم جزئيا"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "غائم"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "زخة مطر غزيرة"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "زخة مطر غزيرة"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "مشمس"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "يصفو"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "وابل من المطر"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "مطر"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "مطر / رعد"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "ثلج"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "مشمس"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "ثلوج كثيفة"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "مطر / رعد"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "مطر متجمد وثلج"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "هادئ"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "غير متوفر"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "عرض أحوال الطقس الحالي"
 
diff --git a/po/ast.po b/po/ast.po
index 4d654d7..6a4c81f 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-13 19:54+0100\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -12,326 +12,399 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "O"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "DV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "ST"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nun pudo anovase la información meteorolóxica"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Imposible abrir la siguiente URL: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Anovamientu del tiempu"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 #, fuzzy
 msgid "_Forecast"
 msgstr "Previsión"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Presión atmosférica (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocidá del vientu (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Direición del vientu (DV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Direición del vientu (DV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humedá (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Ñublao"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Ñubosidá variable"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Mayormente ñuboso"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Ñublao"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Precipitación</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Por favor, meta opciones del proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Por favor, meta opciones del proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Sistema midida:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Métricu"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Códigu d'asitiamientu:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr ""
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Sirvidor proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Usar sirvidor proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Autodeteutar l'entornu"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etiquetes a amosar"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, fuzzy, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Fallu al obtener el nome de host \"%s\". Reintentar en %d segundos."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Fallu al abrir el socket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Fallu al crear una conexón col host (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Fallu al unviar la petición (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Fallu al recibir datos (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Imposible deteutar el llargor del conteníu"
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nun se recibió conteníu."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultaos"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 #, fuzzy
 msgid "Searching..."
 msgstr "Tirando a escampao"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Guetar códigu de llocalización meteorolóxica"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Meta un nome ciudá o códigu postal"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -340,36 +413,36 @@ msgstr ""
 "Informe meteorolóxicu pa: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -379,8 +452,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -388,12 +519,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -401,34 +532,34 @@ msgstr ""
 "\n"
 "Vientu\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocidá"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direición"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Precipitación</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Precipitación</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -437,302 +568,345 @@ msgstr ""
 "\n"
 "Presión atmosférica\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Presión"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humedá"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Ñublao"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Borrina"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Ñublao"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Ñublao"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Nueche: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Informe meteorolóxicu pa: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Por favor, meta opciones del proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Soleyero"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Escampao"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Mayormente ñuboso"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Parcialmente ñuboso"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Ñuboso"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Chubazos"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Chubazos"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Soleyero"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Tirando a escampao"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Chubazos"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Lluvia"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Lluvia / Tormenta"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Ñeve"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Soleyero"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Nevarada"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Lluvia / Tormenta"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Aguañeve y ñeve"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calmo"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Amosar les condiciones atmosfériques d'anguaño"
 
diff --git a/po/be.po b/po/be.po
index e9f645c..552ce7c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-04-05 23:40+0300\n"
 "Last-Translator: Andrej Zakharevich <andrej at zahar.ws>\n"
 "Language-Team: Belarusian <xfce4-dev at xfce.org>\n"
@@ -16,328 +16,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "Зх"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Не атрымалася абнавіць дадзеныя пра надвор'е"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Не атрымалася адчыніць наступны адрас: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Абнаўленне надвор'я"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Прагноз"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Тэмпература (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Атмасферны ціск (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Хуткасць ветру (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Накірунак ветру (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Накірунак ветру (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Вільготнасць (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Хмарна"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Змінна хмарність"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Переважно хмарно"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Хмарна"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Ападкі</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Не зададзена"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Калі ласка, увядзіце наладкі проксі"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Калі ласка, увядзіце наладкі проксі"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Вызначаем…"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Адзінкі вымярэння:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Імперскія"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Метрычныя"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Месцязнаходжанне:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Змяняем…"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Проксі-сервер:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Выкарыстоўваць проксі-сервер"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Аўтавызначэнне па наладках асяроддзя"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Дадзеныя для адлюстравання"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Аніміраваць пераход паміж дадзенымі"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "км"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "гПа"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "міль/гадз"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "км/гадз"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "\""
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Не атрымалася атрымаць назву хаста %s. Паўтор спробы праз %d с."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Не атрымалася адкрыць сокет (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Не атрымалася стварыць злучэнне з хастом (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Памылка дасылання запыту (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Не адрымалася адрымаць дадзеныя (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Адмоўная даўжыня зместа"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Не атрымался вызначыць даўжыню зместа."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Змест не атрыманы."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Вынікі"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Пошук…"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Пошук коду меца для атрымання надвор'я"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Увядзіце назву горада ці паштовы код"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "Звіт про погоду для: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "Температура\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Тэмпература"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "Вітер\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Хуткасць"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Накірунак"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Ападкі</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Ападкі</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,303 +574,346 @@ msgstr ""
 "\n"
 "Атмосферний тиск\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Ціск"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Вільготнасць"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Хмарна"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Туман"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Хмарна"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Хмарна"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Ноч: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Справаздача пра надвор'е для: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Калі ласка, увядзіце наладкі проксі"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Падрабязна"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "Пд"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "ПдПдЗх"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "ПдЗх"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ЗхПдЗх"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Зх"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ЗхПнЗх"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "ПнЗх"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ПнПнЗх"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "Пн"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ПнПнСх"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "ПнСх"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "СхПнСх"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "Сх"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "СхПдСх"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "ПдСх"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "ПдПдСх"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Сонячно"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Ясна"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Переважно хмарно"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Частково хмарно"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Пахмурна"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Сильна злива"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Сильна злива"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Сонячно"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "З праясненнямі"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Злива"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Дощ"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Дощ із грозою"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Сніг"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Сонячно"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Сильний сніг"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Дощ із грозою"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Мокрий сніг"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "спокійно"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Показати поточний стан погоди"
 
diff --git a/po/ca.po b/po/ca.po
index b727943..ba49bde 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-26 18:50+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan <xfce-i18n at xfce.org>\n"
@@ -19,332 +19,405 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
 # Abreviatura de Velocitat del Vent (Wing velocity)
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
 # Ponent (W)
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
 # Abreviatura de direcció del vent (Wind Direction)
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "DV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "CALMAT"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "CALMAT"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "No s’han pogut actualitzar les dades meteorològiques"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "No s'ha pogut obrir l'url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Informació meteorològica"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Pronòstic"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Pressió atmosfèrica (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocitat del vent (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Direcció del vent (DV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Direcció del vent (DV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humitat (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Núvols"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Nuvolositat variable"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Gaire bé ennuvolat del tot"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Núvols"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Precipitacions</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Sense especificar"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Entreu les dades del servidor intermediari"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Entreu les dades del servidor intermediari"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detectant…"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Unitat de mesura:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Mètrica"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Ubicació:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Canvia…"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Servidor intermediari:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Empra el servidor intermediari"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Detecció automàtica a partir de l'entorn"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Informació a mostrar"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Anima les transicions entre etiquetes"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "po"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "No s'ha obtingut el nom de màquina «%s». Es tornarà a provar en %d segons."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "No s'ha obert el sòcol (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "No s'ha pogut crear la connexió amb la màquina remota (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "No s'ha pogut enviar la soŀlicitud (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "No s'ha pogut rebre les dades (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Longitud del contingut negativa"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "No s'ha pogut detectar la mida del contingut."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "No s'ha rebut el contingut."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultats"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Cercant…"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Cerca el codi meteorològic d'un lloc"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Introduïu el nom de la ciutat o el codi postal"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -353,36 +426,36 @@ msgstr ""
 "L'informe meteorològic de %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -392,8 +465,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -401,12 +532,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -414,34 +545,34 @@ msgstr ""
 "\n"
 "Vent\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocitat"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direcció"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Precipitacions</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Precipitacions</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -450,320 +581,363 @@ msgstr ""
 "\n"
 "Pressió atmosfèrica\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Pressió"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humitat"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Núvols"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Boira"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Núvols"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Núvols"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Nit: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Informació meteorològica de: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Entreu les dades del servidor intermediari"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detalls"
 
 # Migjorn (S)
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
 # Migjorn-Garbí - Garbí/Llebeig (SSW)
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
 # Garbí/Llebeig (SW)
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
 # Ponent - Garbí/Llebeig (WSW)
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
 # Ponent (W)
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
 # Ponent - Mestral (WNW)
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
 # Mestral (NW)
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
 # Tramuntana - Mestral (NNW)
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
 # Tramuntana (N)
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
 # Tramuntana - Gregal (NNE)
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
 # Gregal (NE)
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
 # Llevant - Gregal (ENE)
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
 # Llevant (E)
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
 # Llevant - Xaloc (ESE)
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
 # Xaloc (SE)
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
 # Migjorn - Xaloc (SSE)
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "CALMAT"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Clar"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Gaire bé ennuvolat del tot"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Ennuvolat parcialment"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Ennuvolat"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Xàfecs forts"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Xàfecs forts"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Aclarint-se"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Xàfec"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Pluja"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Pluja / trons"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Aiguaneu"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Neu"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Nevada forta"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Pluja / trons"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Aiguaneu i neu"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calmat"
 
 # N/D: No Disponible.
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mostra les condicions meteorològiques actuals"
 
diff --git a/po/cs.po b/po/cs.po
index 827d580..00cb69e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-01-09 00:18+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <xfce-i18n at xfce.org>\n"
@@ -17,328 +17,401 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "RV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "Z"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "SV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "CALM"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "CALM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nelze aktualizovat informace o počasí"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Nelze otevřít následující adresu url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Počasí"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Předpověď počasí"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Teplota (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosférický tlak (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Rychlost větru (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Směr větru (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Směr větru (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Vlhkost (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Mraky"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Vývoj oblačnosti"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Oblačno"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Mraky"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Srážky</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Nenastaveno"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Zadejte nastavení serveru proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Zadejte nastavení serveru proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Hledání..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Měrné jednotky:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperiální"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrické"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Umístění:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Změnit..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Server proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Používat server proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automaticky zjišťovat z proměnných prostředí"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Zobrazované údaje"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animovat přechody mezi popisky"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mi/h"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "palců"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Získání názvu hostitele %s se nezdařilo. Opakování za %d sekund."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Otevření soketu se nezdařilo (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Vytvoření spojení s hostitelem se nezdařilo (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Zaslání požadavku se nezdařilo (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Příjem dat se nezdařil (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Záporná délka obsahu"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Nelze zjistit délku obsahu."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nebyl přijat žádný obsah."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Výsledky"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Hledání..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Vyhledat kód pozorovací stanice"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Zadejte název města nebo PSČ"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -347,36 +420,36 @@ msgstr ""
 "Informace o počasí: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -386,8 +459,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -395,12 +526,12 @@ msgstr ""
 "\n"
 "Teplota\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Teplota"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -408,34 +539,34 @@ msgstr ""
 "\n"
 "Vítr\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Rychlost"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Směr"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Srážky</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Srážky</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -444,303 +575,346 @@ msgstr ""
 "\n"
 "Atmosférický tlak\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Tlak"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Vlhkost"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Mraky"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Mlha"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Mraky"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Mraky"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "V noci: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Informace o počasí: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Zadejte nastavení serveru proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Podrobnosti"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "J"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "JJZ"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "JZSW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ZJZ"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Z"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ZSZ"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "SZ"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "SSZ"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "SSV"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "SV"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "VSV"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "VJV"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "JV"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "JJV"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "CALM"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Slunečno"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Jasno"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Oblačno"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Polojasno"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Oblačno"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Silné dešťové přeháňky"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Silné dešťové přeháňky"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Slunečno"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Vyjasňování"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Dešťové přeháňky"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Déšť"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Déšť, bouřka"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Plískanice"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Sněžení"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Slunečno"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Vydatné sněžení"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Déšť, bouřka"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Plískanice a sněžení"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "bezvětří"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "Nedostupné"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Sleduje aktuální počasí a předpovědi"
 
diff --git a/po/da.po b/po/da.po
index 1342257..c6ae0da 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-08-04 15:20+0100\n"
 "Last-Translator: Lars Christian Jensen <larschrjensen at gmail.com>\n"
 "Language-Team: Dansk <dansk at dansk-gruppen.dk>\n"
@@ -20,322 +20,395 @@ msgstr ""
 "vindstød\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "AT"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VH"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "VR"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "LF"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "ROLIGT"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "ROLIGT"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "LF"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "CF"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Kan ikke opdatere vejrdata"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Kunne ikke åbne følgende url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Vejropdatering"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Udsigt"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosfærisktryk (AT)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vindhastighed (VH)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Vindretning (VR)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Vindretning (VR)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Luftfugtighed (LF)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Skiftende skydække"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Mest overskyet"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Nedbør</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Fjern"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Indtast venligst proxy-indstillingerne"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Indtast venligst proxy-indstillingerne"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detekterer..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Måleenhed:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "L_okation:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "Æn_dr..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "_Proxyserver:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "Benyt proxy_server"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "Auto-detektering fra _miljø"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "_Vælg etiketter til visning"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "_Tilføj"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animër overgangene mellem mærkater"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "miles i timen"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/t"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Kunne ikke hente værtsnavnet \"%s\". Prøver igen om %d sekunder."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Kunne ikke åbne kontaktfladen (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Kunne ikke oprette en forbindelse med værten (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Kunne ikke sende anmodningen (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Kunne ikke modtage data (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Længde af negativt indhold"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Kunne ikke beregne indeholdets længde."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Intet indhold modtaget."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultater"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Søger..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Søg efter vejrlokationkode"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Indtast et bynavn eller postnummer"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -344,36 +417,36 @@ msgstr ""
 "Vejrrapport for: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -383,8 +456,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -392,12 +523,12 @@ msgstr ""
 "\n"
 "Temperatur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -405,34 +536,34 @@ msgstr ""
 "\n"
 "Blæst\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Hastighed"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Retning"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Nedbør</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Nedbør</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -441,303 +572,346 @@ msgstr ""
 "\n"
 "Atmosfærisktryk\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Tryk"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Luftfugtighed"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Tåge"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Nat: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Vejrrapport for: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Indtast venligst proxy-indstillingerne"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaljer"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSV"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SV"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "VSV"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "VNV"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NV"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNV"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNØ"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NØ"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ØNØ"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "Ø"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ØSØ"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SØ"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSØ"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "ROLIGT"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Solrigt"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Klart"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Mest overskyet"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Delvist overskyet"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Overskyet"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Tunge regnbyer"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Tunge regnbyer"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Solrigt"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Opklaring"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Regnbyer"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Regn"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Regn / tordenvejr"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Sne"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Solrigt"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Kraftig sne"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Regn / tordenvejr"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Slud og sne"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "roligt"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "E/T"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Vis nuværende vejrtilstande"
 
diff --git a/po/de.po b/po/de.po
index beceffa..11c4a94 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-23 13:08+0100\n"
 "Last-Translator: Raphael Groner <raphgro-at-web.de>\n"
 "Language-Team: German <xfce-i18n at xfce.org>\n"
@@ -20,316 +20,384 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WG"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "WB"
 
-#: ../panel-plugin/weather.c:139
-#: ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WR"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "LF"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "CL"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "CM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "CH"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "B"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "N"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "R"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "Keine Daten"
 
-#: ../panel-plugin/weather.c:270
-#: ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Wetterdaten können nicht aktualisiert werden"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Folgende Adresse kann nicht geöffnet werden: %s"
 
-#: ../panel-plugin/weather.c:827
-#: ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Wetterbericht"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970
-#: ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "Derzeit keine Daten verfügbar."
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "Vorhersage"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Luftdruck (LD)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Windgeschwindigkeit (WG)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Windgeschwindigkeit - Beaufortskala (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Windrichtung (WR)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Windrichtung in Grad (WR)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Luftfeuchtigkeit (LF)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "Tiefe Wolken (CL)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "Mittelhohe Wolken (CM)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "Hohe Wolken (CH)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "Bewölkung (B)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "Nebel (N)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "Niederschlag (R)"
 
-#: ../panel-plugin/weather-config.c:229
-#: ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Bitte die Proxy-Einstellungen eingeben!"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Bitte einen Ort in den Plugin-Einstellungen angeben."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Ermitteln…"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "_Einheitensystem:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Angloamerikanisch"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "International"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "_Ortsangabe:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "Än_dern …"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "_Proxy-Server:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "Proxy-_Server benutzen"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "Automatische Er_kennung aus der Umgebung"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "Anzahl Tage _für Vorhersage:"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "Anzuzeigende _Beschriftungen"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "Hin_zufügen"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "Entfe_rnen"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "Nach obe_n"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "Nach _unten"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "Übergänge zwischen Beschriftungen _animieren"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "ft"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
-msgstr "Konnte den Hostnamen »%s« nicht ansprechen. Neuer Versuch in %d Sekunden."
+msgstr ""
+"Konnte den Hostnamen »%s« nicht ansprechen. Neuer Versuch in %d Sekunden."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Fehler beim Öffnen des Socket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Fehler beim Verbinden mit dem Rechner (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Fehler beim Senden der Anfrage (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Fehler beim Empfangen der Daten (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negative Datenlänge"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Länge des Inhalts kann nicht bestimmt werden."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Keine Daten erhalten."
 
-#: ../panel-plugin/weather-search.c:148
-#: ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Suchen…"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Wetterstationscode suchen"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Geben Sie eine Stadt oder Postleitzahl an"
 
-#: ../panel-plugin/weather-search.c:468
-#, fuzzy
-msgid "Untitled"
-msgstr "Ohne Titel"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, fuzzy, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -338,23 +406,23 @@ msgstr ""
 "Wetterbericht für: %s\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "Koordinaten\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "Höhenlage"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "Längengrad"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -362,7 +430,7 @@ msgstr ""
 "\n"
 "Zeit\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
@@ -371,7 +439,7 @@ msgstr ""
 "\tTemperatur-, Wind-, Atmosphären- und Wolkendaten gültig für:\n"
 "\t%s\n"
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -386,8 +454,66 @@ msgstr ""
 "\tStart:\t%s\n"
 "\tEnde:\t%s\n"
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -395,12 +521,12 @@ msgstr ""
 "\n"
 "Temperatur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -408,21 +534,21 @@ msgstr ""
 "\n"
 "Wind\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s auf der Beaufortskala)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Richtung"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -430,12 +556,12 @@ msgstr ""
 "\n"
 "Niederschlag\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "Niederschlagsmenge"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -443,16 +569,16 @@ msgstr ""
 "\n"
 "Atmosphäre\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Druck"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Luftfeuchtigkeit"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -460,28 +586,28 @@ msgstr ""
 "\n"
 "Wolken\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Nebel"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Tiefe Wolken"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Mittelhohe Wolken"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Hohe Wolken"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "Bewölkung"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -489,255 +615,302 @@ msgstr ""
 "\n"
 "Daten vom Norwegian Meteorological Institute\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "Danke an met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "Vormittags"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "Nachmittags"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "Abends"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Nachts"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "Heute"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, fuzzy, c-format
 msgid "Weather report for: %s"
 msgstr "Wetterbericht für: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "Bitte einen Ort in den Plugin-Einstellungen angeben."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "Derzeit keine Daten verfügbar."
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Details"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Flaute"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Sonnig"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Klar"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Leicht bewölkt"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Teilweise bewölkt"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Bewölkt"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "Sonnig, Regenschauer"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "Klar, Regenschauer"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "Sonnig, Regenschauer mit Gewitter"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "Klar, Regenschauer mit Gewitter"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 #, fuzzy
 msgid "Sunny, sleet"
 msgstr "Sonnig, Griesel"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 #, fuzzy
 msgid "Clear, sleet"
 msgstr "Klar, Griesel"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Sonnig, Schnee"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Klar, Schnee"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Regenschauer"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Regen"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Regen mit Gewitter"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Schneeregen"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Schnee"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "Schnee mit Gewitter"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Sonnig, Schnee"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "Klar, Schnee"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 #, fuzzy
 msgid "Sunny, Sleet and thunder"
 msgstr "Sonnig, Griesel und Gewitter"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 #, fuzzy
 msgid "Clear, sleet and thunder"
 msgstr "Klar, Griesel und Gewitter"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 #, fuzzy
 msgid "Sunny, Snow and thunder"
 msgstr "Sonnig, Schnee und Gewitter"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 #, fuzzy
 msgid "Clear, snow and thunder"
 msgstr "Klar, Schnee und Gewitter"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "Regenschauer mit Gewitter"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Griesel und Gewitter"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "windstill"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "k.A."
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Zeigt das aktuelle Wetter"
 
+#, fuzzy
+#~ msgid "Untitled"
+#~ msgstr "Ohne Titel"
+
 #~ msgid ""
 #~ "\tPoint data applies to:\n"
 #~ "\t%s\n"
diff --git a/po/el.po b/po/el.po
index 886a36e..a438f9a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: George Vasilakos <forfolias at linuxteam.cs.teilar.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -15,329 +15,402 @@ msgstr ""
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "Δ"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Ήρεμος"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Ήρεμος"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Δεν ήταν δυνατή η ενημέρωση των δεδομένων καιρού"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Αδύνατο το άνοιγμα της ακόλουθης διεύθυνσης: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Ενημέρωση Καιρού"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Πρόβλεψη"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Θερμοκρασία (Τ)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Ατμοσφαιρική πίεση (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Ταχύτητα ανέμου (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Διεύθυνση ανέμου (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Διεύθυνση ανέμου (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Υγρασία (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Σύννεφα"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Μεταβλητή νέφωση"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Νεφελώδης"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Σύννεφα"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Κατακρήμνιση</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Μη ορισμένο"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Παρακαλώ εισάγετε τις ρυθμίσεις διακομιστή μεσολάβησης"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Παρακαλώ εισάγετε τις ρυθμίσεις διακομιστή μεσολάβησης"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Ανίχνευση ..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Μονάδα μέτρησης:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Αυτοκρατορικό"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Μετρικό"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Τοποθεσία:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Αλλαγή..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Εξυπηρετητής διαμεσολάβησης:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Χρήση εξυπηρετητή διαμεσολάβησης"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Αυτόματη ανίχνευση από το περιβάλλον"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Ετικέτες προς εμφάνιση"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Κινούμενες μεταβάσεις μεταξύ των ετικετών"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Αποτυχία λήψης ονόματος υπολογιστή %s. Επόμενη προσπάθεια σε %d δευτερόλεπτα."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Αποτυχία κατά το άνοιγμα της υποδοχής (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Αποτυχία κατά τη δημιουργία σύνδεσης με τον υπολογιστή (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Αποτυχία κατά την αποστολή της αίτησης (%s)"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Αποτυχία κατά τη λήψη των δεδομένων (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Αρνητικό μήκος περιεχομένου."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Δεν ήταν δυνατή η ανίχνευση του μήκους περιεχομένου."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Δεν λήφθηκε κάποιο περιεχόμενο"
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Αποτελέσματα"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Αναζήτηση..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Αναζήτηση κωδικού θέσης καιρού"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Πληκτρολογήστε το όνομα μιας πόλης ή τον ταχυδρομικό κώδικα"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "Πρόβλεψη καιρού για: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "Θερμοκρασία\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Θερμοκρασία"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "Άνεμος\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Ταχύτητα"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Κατακρήμνιση</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Κατακρήμνιση</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,303 +574,346 @@ msgstr ""
 "\n"
 "Ατμοσφαιρική πίεση\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Πίεση"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Υγρασία"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Σύννεφα"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Ομίχλη"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Σύννεφα"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Σύννεφα"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Νύχτα: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Δελτίο καιρού για : %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Παρακαλώ εισάγετε τις ρυθμίσεις διακομιστή μεσολάβησης"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Λεπτομέρειες"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "Ν"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "ΝΝΔ"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "ΝΔ"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ΔΝΔ"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Δ"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ΔΒΔ"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "ΒΔ"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ΒΒΔ"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "Β"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ΒΒΑ"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "ΒΑ"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ΑΒΑ"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "Α"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ΑΝΑ"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "ΝΑ"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "ΝΝΑ"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Ήρεμος"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Ηλιόλουστος"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Καθαρός"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Νεφελώδης"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Κατά τόπους νεφελώδης"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Συννεφιά"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Δυνατή βροχόπτωση"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Δυνατή βροχόπτωση"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Ηλιόλουστος"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Καθαρίζει"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Βροχόπτωση"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Βροχή"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Βροχή / Βροντές"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Χιόνι"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Ηλιόλουστος"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Πολύ χιόνι"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Βροχή / Βροντές"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Χιονόνερο και χιόνι"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "ήρεμος"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "Μ/Δ"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Εμφανίζει τις τρέχουσες καιρικές συνθήκες"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 4926d7d..ed1fb98 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-08-30 17:08+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: British English <xfce-i18n at xfce.org>\n"
@@ -16,328 +16,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "CALM"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "CALM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Cannot update weather data"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Unable to open the following url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Weather Update"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Forecast"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperature (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosphere pressure (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Wind speed (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Wind direction (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Wind direction (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humidity (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Clouds"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Variable Cloudiness"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Mostly Cloudy"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Clouds"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Precipitation</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Unset"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Please enter proxy settings"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Please enter proxy settings"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detecting..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Measurement unit:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Location:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Change..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Proxy server:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Use proxy server"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Auto-detect from environment"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Labels to display"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animate transitions between labels"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Failed to get the hostname %s. Retry in %d seconds."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Failed to open the socket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Failed to create a connection with the host (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Failed to send the request (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Failed to receive data (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negative content length"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Unable to detect the content length."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "No content received."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Results"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Searching..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Search weather location code"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Enter a city name or zip code"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "Weather report for: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "Temperature\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperature"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "Wind\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Speed"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direction"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Precipitation</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Precipitation</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,303 +574,346 @@ msgstr ""
 "\n"
 "Atmospheric pressure\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Pressure"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humidity"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Clouds"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Fog"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Clouds"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Clouds"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Night: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Weather report for: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Please enter proxy settings"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Details"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "CALM"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Sunny"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Clear"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Mostly Cloudy"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Partly Cloudy"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Cloudy"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Heavy Rain Shower"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Heavy Rain Shower"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Sunny"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Clearing"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Rain Shower"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Rain"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Rain / Thunder"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Snow"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Sunny"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Heavy Snow"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Rain / Thunder"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Sleet and Snow"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calm"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/A"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Show current weather conditions"
 
diff --git a/po/es.po b/po/es.po
index 1363b78..1b8af0c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-08-21 02:16-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish\n"
@@ -17,329 +17,402 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "O"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "DV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Calma"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Calma"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "ST"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "No se pudo actualizar la información meteorológica"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Imposible abrir la siguiente URL: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Actualización del tiempo"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Pronóstico"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Presión atmosférica (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocidad del viento (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Dirección del viento (DV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Dirección del viento (DV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humedad (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Nubosidad variable"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Mayormente nuboso"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Precipitación</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Sin establecer"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Por favor, introduzca opciones del proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Por favor, introduzca opciones del proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detectando..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Sistema de medida:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Ubicación:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Cambiar..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Servidor proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Usar servidor proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Autodetectar del entorno"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etiquetas a mostrar"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animar las transiciones entre las etiquetas"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Fallo al obtener el nombre del servidor \"%s\". Reintentar en %d segundos."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Fallo al abrir el socket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Fallo al crear una conexión con el host (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Fallo al enviar la petición (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Fallo al recibir datos (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Longitud de contenido negativo"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Imposible detectar la longitud del contenido"
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "No se recibió contenido."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultados"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Buscar código de localización meteorológica"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Introduzca un nombre de ciudad o código postal"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -348,36 +421,36 @@ msgstr ""
 "Informe meteorológico para: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -387,8 +460,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -396,12 +527,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -409,34 +540,34 @@ msgstr ""
 "\n"
 "Viento\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocidad"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Dirección"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Precipitación</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Precipitación</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -445,303 +576,346 @@ msgstr ""
 "\n"
 "Presión atmosférica\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Presión"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humedad"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Niebla"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Noche: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Informe meteorológico para: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Por favor, introduzca opciones del proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detalles"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Calma"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Soleado"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Despejado"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Mayormente nuboso"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Parcialmente nuboso"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Nuboso"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Lluvia fuerte"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Lluvia fuerte"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Soleado"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Tendiendo a despejado"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Chubascos"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Lluvia"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Lluvia / Tormenta"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Nieve"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Soleado"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Nevada fuerte"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Lluvia / Tormenta"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Aguanieve y nieve"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calma"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mostrar las condiciones atmosféricas actuales"
 
diff --git a/po/eu.po b/po/eu.po
index cece667..0c3d4b4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-22 23:05+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Basque <kde-i18n-doc at kde.org>\n"
@@ -19,310 +19,383 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 0.3\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "HA"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "HB"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "HN"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "BH"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "EMH"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "GH"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "I"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "Daturik ez"
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Ezin dira eguraldiaren datuak eguneratu"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Ezin da URL hau ireki: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Eguraldiaren eguneraketa"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Iragarpena"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Tenperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Presio atmosferikoa (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Haizearen abiadura (HA)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Haizearen abiadura - Beaufort eskala (HB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Haizearen norabidea (HN)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Haizearen norabidea gradutan (HN)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Hezetasuna (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "Behe-hodeiak (BH)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "Erdi mailako hodeiak (EMH)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "Goi-hodeiak (GH)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "Hodeitza (H)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "Lainoa (L)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "<b>Prezipitazioak</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Ezarri gabe"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Mesedez idatzi proxy ezarpenak"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Mesedez ezarri kokaleku bat pluginaren ezarpenetan."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detektatzen..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "_Neurri-unitatea:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Inperiala"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrikoa"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "_Kokalekua:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "_Aldatu..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "_Proxy zerbitzaria:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "Erabili proxy _zerbitzaria"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Atzemateko-automatikoa ingurunetik"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "_Erakutsiko diren etiketak"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "Mugitu _gora"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "Mugitu _behera"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "Animatu etiketen arteko _trantsizioak"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "oin"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mila/o"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/o"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr " - "
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Huts %s ostalari-izena eskuratzean. %d segundutan berriz saiatuko da."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Huts socket-a irekitzean (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Huts ostalariarekin konexioa sortzean (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Huts eskaera bidaltzerakoan (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Huts datuak jasotzerakoan (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Eduki luzera negatiboa"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Ezin da eduki hedapena antzeman."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Ez da edukirik jaso."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Emaitzak"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Bilatzen..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Bilatu eguraldi kokaleku kodea"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Idatzi hiri izen edo posta kodea"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
-msgstr "Izengabea"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -331,23 +404,23 @@ msgstr ""
 "Eguraldi txostena: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "Koordenatuak\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "Altitudea"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "Latitudea"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "Longitudea"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -355,14 +428,14 @@ msgstr ""
 "\n"
 "Ordua\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -372,8 +445,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -381,12 +512,12 @@ msgstr ""
 "\n"
 "Tenperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Tenperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -394,21 +525,21 @@ msgstr ""
 "\n"
 "Haizea\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s Beaufort eskalan)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Abiadura"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Norantza"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -416,12 +547,12 @@ msgstr ""
 "\n"
 "Prezipitazioak\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "Prezipitazio kopurua"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -429,16 +560,16 @@ msgstr ""
 "\n"
 "Presio atmosferikoa\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Presioa"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Hezetasuna"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -446,285 +577,331 @@ msgstr ""
 "\n"
 "Hodeiak\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Lainoa"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Behe-hodeiak"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Erdi mailako hodeiak"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Goi-hodeiak"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "Hodeitza"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "Goiza"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "Arratsaldea"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "Ilunabarra"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Gaua"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "Gaur"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "Bihar"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Eguraldi txostena: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "Mesedez ezarri kokaleku bat pluginaren ezarpenetan."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Xehetasunak"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "H"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "HHM"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "HM"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "MHM"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "M"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "MIM"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "IM"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "IIM"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "I"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "IIE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "IE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "EIE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "EHE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "HE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "HHE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "LASAI"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Eguzkitsua"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Garbia"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Nahiko Lainotua"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Neurri batean lainotua"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Hodeitsu"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Euri zaparrada handiak"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Euri zaparrada handiak"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Eguzkitsua"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Garbitzen"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Euri zaparradak"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Euria"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Euria / Trumoiak"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Elurra"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Eguzkitsua"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Elur asko"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Euria / Trumoiak"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Elurbusti eta Elurra"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "lasai"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "E/G"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Ikusi dauden eguraldi baldintzak"
 
+#~ msgid "Untitled"
+#~ msgstr "Izengabea"
+
 #~ msgid "Overall cloudiness (C)"
 #~ msgstr "Hodei aldakorrak"
 
diff --git a/po/fi.po b/po/fi.po
index 1c98c3f..96b1b36 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-04-27 15:05+0300\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <xfce-i18n at xfce.org>\n"
@@ -16,328 +16,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "L"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "TN"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "TS"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "K"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "TYYNTÄ"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "TYYNTÄ"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "K"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Säätietoja ei voi päivittää"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "URL:ia ei voi avata: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Sääpäivitys"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Ennuste"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Lämpötila (L)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Ilmanpaine (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Tuulennopeus (TN)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Tuulen suunta (TS)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Tuulen suunta (TS)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Ilmankosteus (K)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Pilviä"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Vaihtelevaa pilvisyyttä"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Enimmäkseen pilvistä"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Pilviä"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Sademäärä</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Ei käytössä"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Syötä välityspalvelimen tiedot"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Syötä välityspalvelimen tiedot"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Havaitaan..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Mittayksikkö:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperiaalinen"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrinen"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Sijainti:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Vaihda..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Välityspalvelin:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Käytä välityspalvelinta"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Tunnista automaattisesti"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Näytettävät tiedot"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Tekstin vaihtumisanimaatiot"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Isäntänimeä %s ei löytynyt. Uusi yritys %d sekunnin kuluttua."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Pistokkeen avaus epäonnistui (%s)"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Yhteyden muodostus isäntään epäonnistui (%s)"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Pyynnon lähetys epäonnistui (%s)"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Tieton vastaanotto epäonnistui (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Sisällön pituus negatiivinen"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Sisällön pituutta ei voitu selvittää."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Sisältöä ei otettu vastaan."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Tulokset"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Etsitään..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Etsi sääaseman tunnus"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Kirjoita kaupungin nimi tai postinumero"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "Säätiedotus alueelle %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "Lämpötila\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Lämpötila"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "Tuuli\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Suunta"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Sademäärä</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Sademäärä</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,303 +574,346 @@ msgstr ""
 "\n"
 "Ilmanpaine\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Paine"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Ilmankosteus"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Pilviä"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Sumuista"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Pilviä"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Pilviä"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Yö: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Säätiedotus alueelle: %s."
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Syötä välityspalvelimen tiedot"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Lisätietoja"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "TYYNTÄ"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Aurinkoista"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Selkeää"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Enimmäkseen pilvistä"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Osittain pilvistä"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Pilvistä"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Rankkoja sadekuuroja"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Rankkoja sadekuuroja"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Aurinkoista"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Selkenevää"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Sadekuuroja"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Sateista"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Sadetta / ukkosta"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Lumisadetta"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Aurinkoista"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Sankkaa lumisadetta"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Sadetta / ukkosta"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Räntä- ja lumisadetta"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "tyven"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "-"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Näytä ajantasaiset säätiedot"
 
diff --git a/po/fr.po b/po/fr.po
index 74bfc2e..84dad75 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-21 08:37+0100\n"
 "Last-Translator: Colin Leroy <colin at colino.net>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -17,328 +17,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "O"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "SV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Calme"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Calme"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "R"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Échec à la mise à jour des données météo"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Échec à l'ouverture du lien : %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Mise-à-jour météo"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Prévision"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Température (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Pression atmosphérique (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vitesse du vent (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Sens du vent (SV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Sens du vent (SV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humidité (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Nuages"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Temps nuageux variable"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Très nuageux"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Nuages"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Précipitations</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Non spécifié"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Veuillez entrer les paramètres du proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Veuillez entrer les paramètres du proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Détection..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Unité de mesure :"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Impérial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Métrique"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Lieu :"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Changer..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Serveur proxy :"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Utiliser un serveur proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Détection automatique à partir de l'environnement"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Étiquettes à afficher"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animer les transitions entre étiquettes."
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "p"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Impossible de résoudre le nom d'hôte %s. Réessai dans %d secondes."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Impossible d'ouvrir la connexion (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Impossible de se connecter à l'hôte (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Impossible d'envoyer la requête (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Impossible de recevoir des données (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Longueur du contenu négative"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Impossible de détecter la longueur du contenu."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Aucun contenu reçu."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Résultats"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Recherche..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Chercher un code de lieu de station météo"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Entrer un nom de ville ou un code postal"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -347,36 +420,36 @@ msgstr ""
 "Rapport météo pour : %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -386,8 +459,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -395,12 +526,12 @@ msgstr ""
 "\n"
 "Température\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Température "
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -408,34 +539,34 @@ msgstr ""
 "\n"
 "Vent\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Vitesse "
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direction "
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Précipitations</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Précipitations</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -444,303 +575,346 @@ msgstr ""
 "\n"
 "Pression atmosphérique\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Pression "
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humidité "
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Nuages"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Brouillard"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Nuages"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Nuages"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Nuit : %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Rapport météo pour : %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Veuillez entrer les paramètres du proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Détails"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Calme"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Ensoleillé"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Clair"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Très nuageux"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Peu nuageux"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Nuageux"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Grosses averses"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Grosses averses"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Ensoleillé"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Dégagé"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Averses"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Pluie"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Pluie et éclairs"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Verglas"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Neige"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Ensoleillé"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Grosses chutes de neige"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Pluie et éclairs"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Verglas et pluie"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calme"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "Indisponible"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Afficher les conditions météo actuelles"
 
diff --git a/po/gl.po b/po/gl.po
index 62f94f2..009e659 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2010-02-10 12:43+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -21,334 +21,406 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr ""
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 #, fuzzy
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr ""
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr ""
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr ""
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 #, fuzzy
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "calma"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "calma"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 #, fuzzy
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Non se puideron actualizar os datos do tempo"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Non se puido abrir o seguinte url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Actualización do tempo"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Prognóstico"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Presión atmosférica (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocidade do vento (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Dirección do vento (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Dirección do vento (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humidade (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Nubes"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "<b>Variábel de busca</b>"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Tempo: anubrado"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Nubes"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Precipitación</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 #, fuzzy
 msgid "Unset"
 msgstr "Desconfigurar"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Introduza a configuración do proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Introduza a configuración do proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detectando..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Unidade de medición:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Localización:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Cambiar..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Servidor proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Usar un servidor proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr ""
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etiquetas para mostrar"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animar as transicións entre etiquetas"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 #, fuzzy
 msgid "in"
 msgstr "pl"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Produciuse un erro ó obter o nome de máquina %s. Volverase intentar en %d "
 "segundos."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Non se puido abrir o conectador (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Non se puido crear unha conexión ca máquina (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Fallo ao enviar a solicitude (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Fallo ao recibir os datos (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Non se puido detectar a lonxitude do contido."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Non se recibiu ningún contido."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultados"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: ../panel-plugin/weather-search.c:229
+#: ../panel-plugin/weather-search.c:220
 #, fuzzy
-msgid "Search weather location code"
+msgid "Search location"
 msgstr "Ver <i>%(name)s</i> en <b>Buscar no Google Code</b>"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Introduza un nome de cidade ou código postal"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -357,36 +429,36 @@ msgstr ""
 "Previsión meteorolóxica para: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -396,8 +468,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -405,12 +535,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -418,34 +548,34 @@ msgstr ""
 "\n"
 "Vento\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Dirección"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Precipitación</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Precipitación</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -454,309 +584,352 @@ msgstr ""
 "\n"
 "Presión atmosférica\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Presión"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humidade"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Nubes"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Néboa"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Nubes"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Nubes"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Noite: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Previsión meteorolóxica para: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Introduza a configuración do proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detalles"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 #, fuzzy
 msgid "SW"
 msgstr "Remuíño (horario)"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 #, fuzzy
 msgid "NE"
 msgstr "Elemento no_vo"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 #, fuzzy
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 #, fuzzy
 msgid "SE"
 msgstr "De_finir mapa de cores..."
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 #, fuzzy
 msgid "CALM"
 msgstr "calma"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Soleado"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 #, fuzzy
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Tempo: anubrado"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Tempo: anubrado"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Anubrado"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Folerpas de neve fortes"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Folerpas de neve fortes"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Soleado"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Limpar"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Pingas de chuvia"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Chuvia"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Thunder Bay"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Neve"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Soleado"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Neve forte"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Thunder Bay"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Folerpas de neve lixeiras"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calmo"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/A"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mostrar as condicións meteorolóxicas actuais"
 
diff --git a/po/he.po b/po/he.po
index 5adfa07..3f27c25 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-19 20:00+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan at gmx.ca>\n"
 "Language-Team:  <xfce-i18n at xfce.org>\n"
@@ -17,327 +17,401 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Hebrew\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr ""
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr ""
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "‏WS"
 
 # מע.
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "מערב"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "‏WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "‏H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "‏CL"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "‏CM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "‏CH"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr ""
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
 # לא קיים
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "אין מידע"
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "לא ניתן לעדכן מידע מזג אויר"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "לא ניתן לפתוח את כתובת ה־URL הבאה: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "עדכון מזג אויר"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "אין מידע זמין כעת"
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_תחזית"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "טמפרטורה (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "לחץ אטמוספרי (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "מהירות משב (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "מהירות משב - סולם בופורט (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "כיוון משב (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "כיוון משב במעלות (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "לחות (H)"
 
 # עננות
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "מעוננות נמוכה (CL)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "מעוננות בינונית (CM)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "מעוננות גבוהה (CH)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "מעוננות"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "ערפל (F)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "משקעים (R)"
 
 # לא נקבע/ה
 # לא הוגדר/ה
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "נא להזין הגדרות מתווך"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "נא להזין מיקום בהגדרות התוסף."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "מאתר כעת..."
 
 # יחידת מדידה
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "מערכת _מדידה:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "אימפריאלית"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "מטרית"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "מיקום:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "_שינוי..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "שרת מתווך:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "שימוש בשרת מ_תווך"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "איתור אוטומטי מן _סביבת העבודה"
 
 # ימי חיזוי
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "מספר של ימי _תחזית:"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "_תוויות להצגה"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "ה_נפשת מעברים בין תוויות"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
 # יחידת מידה למדידת לחץ
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "‏psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "‏hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "מ״ש"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "ק״מ/ש"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 #, fuzzy
 msgid "in"
 msgstr "אצל"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "כשל בקבלת מארח %s. ניסיון חוזר בעוד %d שניות."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "כשל בפתיחת ה־socket ‏(%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "כשל ביצירת חיבור עם המארח (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "כשל בשליחת הבקשה (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "כשל בקבלת מידע (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "אורך תוכן שלישי"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "לא ניתן לאתר את אורך התוכן."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "לא התקבל תוכן."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "תוצאות"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "מחפש כעת..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "חיפוש מיקוד מקום מזג אויר"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "נא להזין שם עיר או מיקוד"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,24 +420,24 @@ msgstr ""
 "תחזית מזג אוויר עבור: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "קואורדינטות\n"
 
 # רום
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "גובה"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "קו רוחב"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "קו אורך"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -371,14 +445,14 @@ msgstr ""
 "\n"
 "זמן\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -388,8 +462,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -397,12 +529,12 @@ msgstr ""
 "\n"
 "טמפרטורה\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "טמפרטורה"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -411,21 +543,21 @@ msgstr ""
 "משב\n"
 
 # RTL: RLE?
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s בסולם בופורט)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "מהירות"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "כיוון"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -433,12 +565,12 @@ msgstr ""
 "\n"
 "משקעים\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "כמות משקעים"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -446,16 +578,16 @@ msgstr ""
 "\n"
 "אטמוספרה\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "לחץ"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "לחות"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -463,29 +595,29 @@ msgstr ""
 "\n"
 "עננים\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "ערפל"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "עננים נמוכים"
 
 # ממוצעים
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "עננים בינוניים"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "עננים גבוהים"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "מעוננות"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -493,260 +625,303 @@ msgstr ""
 "\n"
 "מידע לקוח מן המכון המטאורולוגי הנורבגי\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "תודה למכון המטאורולוגי הנורבגי met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "בוקר"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "אחר הצהריים"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "ערב"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "לילה"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "היום"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "מחר"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "תחזית מזג אוויר עבור: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "נא להזין מיקום בהגדרות התוסף."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "אין מידע זמין כעת"
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_פרטים"
 
 # ד.
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "דרום"
 
 # ד.ד.מע.
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "דרום דרום מערב"
 
 # ד.מע.
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "דרום מערב"
 
 # מע.ד.מע.
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "מערב דרום מערב"
 
 # מע.
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "מערב"
 
 # מע.צ.מע.
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "מערב צפון מערב"
 
 # צ.מע.
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "צפון מערב"
 
 # צ.צ.מע.
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "צפון צפון מערב"
 
 # צ.
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "צפון"
 
 # צ.צ.מז.
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "צפון צפון מזרח"
 
 # צ.מז.
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "צפון מזרח"
 
 # מז.צ.מז.
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "מזרח צפון מזרח"
 
 # מז.
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "מזרח"
 
 # מז.ד.מז.
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "מזרח דרום מזרח"
 
 # ד.מז.
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "דרום מזרח"
 
 # ד.ד.מז.
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "דרום דרום מזרח"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "שלו"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "שטוף שמש"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "בהיר"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "מעונן מעט"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "מעונן חלקית"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "מעונן"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "שטוף שמש, ממטרי גשם"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "בהיר, ממטרי גשם"
 
 # ממטרי גשם מלווים ברעם
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "שטוף שמש, ממטרי גשם עם רעם"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "בהיר, ממטרי גשם עם רעם"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "שטוף שמש, גשם־שלג"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "בהיר, גשם־שלג"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "שטוף שמש, שלג"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "בהיר, שלג"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "ממטרי גשם"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "גשם"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "גשם עם רעם"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "גשם־שלג"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "שלג"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "שלג עם רעם"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "שטוף שמש, שלג"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "בהיר, שלג"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "שטוף שמש, גשם־שלג ורעם"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "בהיר, גשם־שלג ורעם"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "שטוף שמש, שלג ורעם"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "בהיר, שלג ורעם"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "ממטרי גשם עם רעם"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "גשם־שלג ורעם"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "שלו"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "לא זמין"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "הצגת תנאי מזג אויר נוכחיים"
 
diff --git a/po/hr.po b/po/hr.po
index e6c299e..ccde4a0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2011-10-05 00:22+0200\n"
 "Last-Translator: Ivica Kolić <ikoli at yahoo.com>\n"
 "Language-Team: Croatian <ikoli at yahoo.com>\n"
@@ -21,345 +21,417 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: CROATIA\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr ""
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr ""
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr ""
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr ""
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr ""
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr ""
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr ""
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr ""
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Ne mogu ažurirati podatke o vremenu"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Nij moguće otvoriti sljedeći url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Dopune vremena"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Prognoza vremena"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosferski tlak (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Brzina vjetra (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Smjer vjetra (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Smjer vjetra u supnjevima (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Vlažnost (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "Oborine (R)"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Nepostavljeno"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Molim unesite postavke proxy-ja"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Molim postavite lokaciju u postavke priključka"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Otkrivanje ..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "Mjerni _sustav:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrička"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "L_okacija:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "Promije_ni..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "_Proxy poslužitelj:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "Koristi proxy _poslužitelj"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "Auto-detektirati iz _okruženja"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "_Natpisi za prikaz"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "Animiranje _prijelaza između oznaka"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
-msgstr ""
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
+msgstr "Neuspješno slanje zahtjeva (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Neuspjelo stvaranje veze sa računalom (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Neuspješno slanje zahtjeva (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Neuspjelo primanje podataka (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr ""
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nema primljenoga sadržaja. "
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Rezultati"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Tražim..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+msgid "Search location"
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Unesite naziv grada ili poštanski broj"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
 "\n"
 msgstr "Vremenski izvještaj za: %s.\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -369,8 +441,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -378,12 +508,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -391,21 +521,21 @@ msgstr ""
 "\n"
 "Vjetar\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Brzina"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Smjer"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -413,12 +543,12 @@ msgstr ""
 "\n"
 "Oborine\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr ""
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -426,16 +556,16 @@ msgstr ""
 "\n"
 "Atmosferski tlak\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Tlak"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Vlažnost"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -446,270 +576,313 @@ msgstr ""
 "\n"
 "Oblaci\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Magla"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Noć"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Vremenski izvještaj za:%s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "Molim postavite lokaciju u postavke priključka"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Pojedinosti"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "J"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "JJZ"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "JZ"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ZJZ"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Z"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ZSZ"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "SZ"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "SSZ"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "SSI"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "SI"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ISI"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "I"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "IJI"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "JI"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "JJI"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "UMJERENO"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Sunčano"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Vedro"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Lagana naoblaka"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Djelomično oblačno"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Oblačno"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "Sunčano, snijeg"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "Vedro, snijeg"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Kišni pljuskovi"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Kiša"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Kiša s grmljavinom"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Snijeg"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Sunčano, snijeg"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "Vedro, snijeg"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "mirno"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr ""
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Prikaži trenutne vremenske uvjete"
 
diff --git a/po/hu.po b/po/hu.po
index 4c6c6e1..555ee6d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-24 23:55+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
@@ -20,328 +20,401 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "LÁ"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "SzS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "Ny"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "SzI"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "ENYHE"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "ENYHE"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "SzÉ"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nem lehet frissíteni az időjárási adatokat"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "A következő URL megnyitása meghiúsult: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Időjárási adatok frissítése"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "Előrejelzés"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Hőmérséklet (H)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Légnyomás (LÁ)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Szélsebesség (SzS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Szélirány (SzI)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Szélirány (SzI)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Páratartalom (P)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Felhők"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Változóan felhős"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Többnyire felhős"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Felhők"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Csapadék</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Visszaállítás"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Adja meg a proxybeállításokat"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Adja meg a proxybeállításokat"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Észlelés…"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Mértékrendszer:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Angolszász"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrikus"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Hely:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Változtatás…"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Proxy kiszolgáló:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Proxy kiszolgáló használata"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automatikus érzékelés a környezetből"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Megjelenítendő címkék"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Átmenetek animálása címkék közt"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "A gépnév (%s) lekérése meghiúsult. Újrapróbálkozás %d másodperc múlva."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "A foglalat (%s) megnyitása meghiúsult."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Nem sikerült kapcsolatot létrehozni a géppel (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Nem sikerült elküldeni a kérést (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Nem sikerült adatokat fogadni (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negatív tartalomhossz"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "A tartalomhossz nem érzékelhető."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nem érkezett tartalom."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Eredmények"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Keresés…"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Időjárási helységkódok keresése"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Adja meg egy város nevét vagy irányítószámát:"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -350,36 +423,36 @@ msgstr ""
 "Időjárás-jelentés a következőhöz: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -389,8 +462,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -398,12 +529,12 @@ msgstr ""
 "\n"
 "Hőmérséklet\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Hőmérséklet"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -411,34 +542,34 @@ msgstr ""
 "\n"
 "Szél\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Sebesség"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Irány"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Csapadék</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Csapadék</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -447,303 +578,346 @@ msgstr ""
 "\n"
 "Légnyomás\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Nyomás"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Páratartalom"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Felhők"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Köd"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Felhők"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Felhők"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Éjszaka: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Időjárás-jelentés a következőhöz: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Adja meg a proxybeállításokat"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Részletek"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "D"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "DDNy"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "DNy"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "NyDNy"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Ny"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "NyÉNy"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "ÉNy"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ÉÉNy"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "É"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ÉÉK"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "ÉK"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "KÉK"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "K"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "KDK"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "DK"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "DDK"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "ENYHE"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Napos"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Tiszta"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Többnyire felhős"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Részlegesen felhős"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Felhős"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Heves záporok"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Heves záporok"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Napos"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Tisztul"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Zápor"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Eső"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Eső / mennydörgés"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Havazás"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Napos"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Heves havazás"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Eső / mennydörgés"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Ónos eső és hó"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "enyhe"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "–"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "A jelenlegi időjárási helyzet megjelenítése"
 
diff --git a/po/id.po b/po/id.po
index e40e845..ef3679f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2008-06-21 19:51+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -16,328 +16,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "KA"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "B"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "AA"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "K"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "TENANG"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "TENANG"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "K"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Tak dapat memutakhirkan data cuaca"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Tak dapat membuka url berikut: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Pemutakhiran Cuaca"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Ramalan Cuaca"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Tekanan atmosfer (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Kecepatan angin (KA)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Arah angin (AA)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Arah angin (AA)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Kelembaban (K)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Berawan"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Berawan yang Bervariasi"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Sebagian Besar Berawan"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Berawan"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Curah Hujan</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Tidak Diatur"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Silakan masukkan pengaturan proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Silakan masukkan pengaturan proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Mendeteksi"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Unit pengukuran:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Lokasi:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Ganti..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Server proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Gunakan server proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Deteksi otomatis dari lingkungan"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Label untuk tampilan"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animasikan transisi di antara label"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mpj"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/j"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Gagal mendapatkan nama host %s. Coba lagi dalam %d detik."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Gagal membuka soket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Gagal membuat koneksi dengan host (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Gagal mengirim permintaan (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Gagal menerima data (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Panjang konten negatif"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Gagal mendeteksi panjang isi."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Tak ada isi yang diterima."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Hasil"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Mencari..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Telusuri kode lokasi cuaca"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Masukkan nama kota atau kode pos"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "Laporan cuaca untuk: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "Temperatur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "Angin\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Kecepatan"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Arah"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Curah Hujan</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Curah Hujan</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,303 +574,346 @@ msgstr ""
 "\n"
 "Tekanan atmosfer\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Tekanan"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Kelembaban"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Berawan"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Berkabut"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Berawan"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Berawan"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Malam: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Laporan cuaca untuk: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Silakan masukkan pengaturan proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detail"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SBD"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "BD"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "BBD"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "B"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "BBL"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "BL"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "UBL"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "U"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "UTL"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "TL"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "TTL"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "T"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "TTg"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "Tg"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "STg"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "TENANG"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Cerah"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Cerah"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Sebagian Besar Berawan"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Sebagian Berawan"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Berawan"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Hujan Sangat Lebat"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Hujan Sangat Lebat"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Cerah"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Menjadi Cerah"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Hujan Lebat"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Hujan"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Hujan / Petir"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Salju"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Cerah"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Salju Lebat"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Hujan / Petir"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Es Tipis dan Salju"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "tenang"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "tak tersedia"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Tampilkan kondisi cuaca terkini"
 
diff --git a/po/it.po b/po/it.po
index 376df82..a512058 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-12-08 07:54+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian Translation Team <xfce-it-translators at googlegroups."
@@ -19,330 +19,403 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "O"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "DV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "U"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "CALMA"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "CALMA"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "U"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "TP"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Impossibile aggiornare i dati meteo"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Impossibile aprire l'url seguente: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Aggiornamento meteo"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Previsioni"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Pressione atmosferica (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocità del vento (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Direzione del vento (DV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Direzione del vento (DV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Umidità (U)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Nuvole"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Nuvolosità variabile"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Prevalentemente nuvoloso"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Nuvole"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Precipitazioni</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Non impostato"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Inserire le impostazioni del proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Inserire le impostazioni del proxy"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Rilevamento in corso..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Sistema di misura:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperiale"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrico"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Località:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Cambia..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Server proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Usa server proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Rileva automaticamente dall'ambiente"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etichette da visualizzare"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Anima le transizioni tra le etichette"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Impossibile ottenere il nome dell'host \"%s\". Nuovo tentativo tra %d "
 "secondi."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Impossibile aprire il socket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Impossibile creare una connessione con l'host (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Invio della richiesta fallito (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Ricevimento dati fallito (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Lunghezza del contenuto negativa"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Impossibile determinare la lunghezza del contenuto."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nessun contenuto ricevuto."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Risultati"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Cerca un codice località meteo"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Inserire un nome di città o un codice \"zip\""
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -351,36 +424,36 @@ msgstr ""
 "Rapporto meteo per: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -390,8 +463,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -399,12 +530,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -412,34 +543,34 @@ msgstr ""
 "\n"
 "Vento\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocità"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direzione"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Precipitazioni</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Precipitazioni</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -448,303 +579,346 @@ msgstr ""
 "\n"
 "Pressione atmosferica\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Pressione"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Umidità"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Nuvole"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Nebbia"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Nuvole"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Nuvole"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Notte: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Rapporto meteo per: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Inserire le impostazioni del proxy"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Dettagli"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "CALMA"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Soleggiato"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Sereno"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Prevalentemente nuvoloso"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Parzialmente nuvoloso"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Nuvoloso"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Rovesci intensi"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Rovesci intensi"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Soleggiato"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Schiarite"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Rovesci"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Pioggia"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Pioggia / tuoni"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Neve"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Soleggiato"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Forte nevicata"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Pioggia / tuoni"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Neve e grandine"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calmo"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mostra le condizioni meteo attuali"
 
diff --git a/po/ja.po b/po/ja.po
index 465faa2..134dff9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 23:59+0900\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-26 00:02+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-i18n at xfce.org>\n"
@@ -21,309 +21,383 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:125
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "気温"
 
-#: ../panel-plugin/weather.c:128
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "気圧"
 
-#: ../panel-plugin/weather.c:131
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "風速"
 
-#: ../panel-plugin/weather.c:134
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "風力"
 
-#: ../panel-plugin/weather.c:137 ../panel-plugin/weather.c:140
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "風向"
 
-#: ../panel-plugin/weather.c:143
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "湿度"
 
-#: ../panel-plugin/weather.c:146
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "下層雲"
 
-#: ../panel-plugin/weather.c:149
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "中層雲"
 
-#: ../panel-plugin/weather.c:152
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "上層雲"
 
-#: ../panel-plugin/weather.c:155
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "雲量"
 
-#: ../panel-plugin/weather.c:158
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "霧"
 
-#: ../panel-plugin/weather.c:161
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "降水量"
 
-#: ../panel-plugin/weather.c:238
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "データ無し"
 
-#: ../panel-plugin/weather.c:265 ../panel-plugin/weather.c:864
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "気象データを更新できません"
 
-#: ../panel-plugin/weather.c:794
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "次の URL を開くことができません: %s"
 
-#: ../panel-plugin/weather.c:822 ../panel-plugin/weather-summary.c:621
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
 #: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "最新の天気"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:965 ../panel-plugin/weather-summary.c:666
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "現在利用可能なデータがありません。"
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "予報(_F)"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "気温 (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "気圧 (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "風速 (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "風力 (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "風向 (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "風向・角度 (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "湿度 (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "下層雲量 (CL)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "中層雲量 (CM)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "上層雲量 (CH)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "全雲量 (C)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "霧 (F)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "降水量 (R)"
 
-#: ../panel-plugin/weather-config.c:239 ../panel-plugin/weather-config.c:393
-#: ../panel-plugin/weather-config.c:504
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "解除"
 
-#: ../panel-plugin/weather-config.c:335
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "プロキシ設定を入力してください"
 
-#: ../panel-plugin/weather-config.c:402
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "プラグイン設定の場所を入力してください"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "検出しています..."
 
-#: ../panel-plugin/weather-config.c:460
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "測定単位(_M):"
 
-#: ../panel-plugin/weather-config.c:465
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "ヤード・ポンド法"
 
-#: ../panel-plugin/weather-config.c:467
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "メートル法"
 
-#: ../panel-plugin/weather-config.c:480
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "地域(_O):"
 
-#: ../panel-plugin/weather-config.c:518
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "変更(_G)..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:531
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "プロキシサーバー(_P):"
 
-#: ../panel-plugin/weather-config.c:536
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "プロキシサーバーを使用する(_S)"
 
-#: ../panel-plugin/weather-config.c:538
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "環境から自動検出する(_E)"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:603
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "予報日数(_F):"
 
-#: ../panel-plugin/weather-config.c:625
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "表示するラベル(_L)"
 
-#: ../panel-plugin/weather-config.c:629
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../panel-plugin/weather-config.c:650
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "上へ(_U)"
 
-#: ../panel-plugin/weather-config.c:655
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "下へ(_D)"
 
-#: ../panel-plugin/weather-config.c:693
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "ラベルの切り換えをアニメーションで行う(_T)"
 
-#: ../panel-plugin/weather-data.c:124
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "ft"
 
-#: ../panel-plugin/weather-data.c:124
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:126
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:126
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:128
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:128
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:130
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:130
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:143
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:143
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "ホスト名 %s の取得に失敗しました。%d 秒後に再試行してください。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:240
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "ソケットを開くことに失敗しました (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:251
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "ホストとの接続の生成に失敗しました (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:294
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "リクエストの送信に失敗しました (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:347
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "データの受信に失敗しました (%s)"
 
-#: ../panel-plugin/weather-http.c:373
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "負の内容長です"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:409
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "内容の長さを検出できませんでした。"
 
-#: ../panel-plugin/weather-http.c:417
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "受信された内容はありません。"
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:278
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "結果"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "検索しています..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "気象地域コードの検索"
 
-#: ../panel-plugin/weather-search.c:251
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "都市名または ZIP コードを入力してください"
 
-#: ../panel-plugin/weather-search.c:466
-msgid "Untitled"
-msgstr "名前無し"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:270
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -332,23 +406,23 @@ msgstr ""
 "%s の詳しい天気情報です。\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:275
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "位置\n"
 
-#: ../panel-plugin/weather-summary.c:276
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "海抜"
 
-#: ../panel-plugin/weather-summary.c:277
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "緯度"
 
-#: ../panel-plugin/weather-summary.c:278
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "経度"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -356,7 +430,7 @@ msgstr ""
 "\n"
 "時間\n"
 
-#: ../panel-plugin/weather-summary.c:283
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
@@ -365,7 +439,7 @@ msgstr ""
 "\t気温、風、大気、および雲の情報は以下の日時の予報です:\n"
 "\t%s\n"
 
-#: ../panel-plugin/weather-summary.c:290
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -379,8 +453,66 @@ msgstr ""
 "\t%s から\n"
 "\t%s まで\n"
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:296
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -388,12 +520,12 @@ msgstr ""
 "\n"
 "気温\n"
 
-#: ../panel-plugin/weather-summary.c:297
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "気温"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:300
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -401,21 +533,21 @@ msgstr ""
 "\n"
 "風\n"
 
-#: ../panel-plugin/weather-summary.c:305
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (風力 %s)\n"
 
-#: ../panel-plugin/weather-summary.c:305
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "風速"
 
-#: ../panel-plugin/weather-summary.c:314
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "風向"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:322
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -423,12 +555,12 @@ msgstr ""
 "\n"
 "降水\n"
 
-#: ../panel-plugin/weather-summary.c:323
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "降水量"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:326
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -436,16 +568,16 @@ msgstr ""
 "\n"
 "大気\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "気圧"
 
-#: ../panel-plugin/weather-summary.c:328
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "湿度"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:331
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -453,28 +585,28 @@ msgstr ""
 "\n"
 "雲\n"
 
-#: ../panel-plugin/weather-summary.c:332
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "霧"
 
-#: ../panel-plugin/weather-summary.c:333
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "下層雲"
 
-#: ../panel-plugin/weather-summary.c:334
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "中層雲"
 
-#: ../panel-plugin/weather-summary.c:335
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "上層雲"
 
-#: ../panel-plugin/weather-summary.c:336
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "全雲量"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -482,244 +614,290 @@ msgstr ""
 "\n"
 "情報提供: ノルウェー気象研究所\n"
 
-#: ../panel-plugin/weather-summary.c:341
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "Thanks to met.no"
 
-#: ../panel-plugin/weather-summary.c:444
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "朝"
 
-#: ../panel-plugin/weather-summary.c:447
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "日中"
 
-#: ../panel-plugin/weather-summary.c:450
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "夕方"
 
-#: ../panel-plugin/weather-summary.c:453
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "夜"
 
-#: ../panel-plugin/weather-summary.c:462
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "今日"
 
-#: ../panel-plugin/weather-summary.c:464
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "明日"
 
-#: ../panel-plugin/weather-summary.c:629
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "%s の天気情報"
 
-#: ../panel-plugin/weather-summary.c:652
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "プラグイン設定の場所を入力してください"
 
-#: ../panel-plugin/weather-summary.c:654
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "現在利用可能なデータがありません。"
 
-#: ../panel-plugin/weather-summary.c:669
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "詳細(_D)"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "南"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "南南西"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "南西"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "西南西"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "西"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "西北西"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "北西"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "北北西"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "北"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "北北東"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "北東"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "東北東"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "東"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "東南東"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "南東"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "南南東"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "無風"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "快晴"
 
 # Sunny night
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "快晴"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "晴れ"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "晴れ時々曇り"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "曇り"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "晴れ時々雨"
 
 # night
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "晴れ時々雨"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "晴れ時々雷雨"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "晴れ時々雷雨"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "晴れ時々みぞれ"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "晴れ時々みぞれ"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "晴れ時々雪"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "晴れ時々雪"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "曇り時々雨"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "雨"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "雷雨"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "みぞれ"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "雪"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "雷を伴う雪"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "晴れ時々雪"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "晴れ時々雪"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "晴れ時々雷を伴うみぞれ"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "晴れ時々雷を伴うみぞれ"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "晴れ時々雷を伴う雪"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "晴れ時々雷を伴う雪"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "曇り時々雷雨"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "雷を伴うみぞれ"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "無風"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "不明"
 
 #: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "現在の天気状況を表示します。"
+
+#~ msgid "Untitled"
+#~ msgstr "名前無し"
diff --git a/po/ko.po b/po/ko.po
index fc3feac..422b26f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin.master\n"
-"Report-Msgid-Bugs-To: xfce-i18n <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-25 22:30+0900\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426 at gmail.com>\n"
 "Language-Team: xfce-i18n <xfce-i18n at xfce.org>\n"
@@ -17,315 +17,383 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "기온"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "기압"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "풍속"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "보포르 풍속"
 
-#: ../panel-plugin/weather.c:139
-#: ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "풍향"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "습도"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "구름 조금"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "구름 적당히"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "구름 많이"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "구름 양"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "안개"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "강수율"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "데이터 없음"
 
-#: ../panel-plugin/weather.c:270
-#: ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "날씨 정보를 업데이트할 수 없습니다"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "다음 URL을 열 수 없습니다: %s"
 
-#: ../panel-plugin/weather.c:827
-#: ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "날씨 업데이트"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970
-#: ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "현재 데이터가 없습니다."
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "예보(_F)"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "기온(T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "기압(P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "풍속(WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "풍속 - 보포르 규모(WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "풍향(WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "도 단위 풍향(WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "습도(H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "구름 조금(CL)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "구름 적당히(CM)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "구름 많음(CH)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "구름 양(C)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "안개(F)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "강수율(R)"
 
-#: ../panel-plugin/weather-config.c:229
-#: ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "해제"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "프록시 설정을 입력하여주십시오"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "플러그인 설정에서 지역을 설정해 주시기 바랍니다."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "감지 중..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "측정단위(_M):"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "야드-파운드"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "미터법"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "지역(_O):"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "바꾸기(_G)..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "프록시 서버(_P):"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "프록시 서버 사용(_S)"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "환경 자동감지(_E)"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "일기예보일 수(_F):"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "표시할 레이블(_L)"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "추가(_A)"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "제거(_R)"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "위로 옮기기(_U)"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "아래로 옮기기(_D)"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "레이블 간 애니메이션 전환(_T)"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "피트"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "인치"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "%s 호스트 이름을 가져오는데 실패했습니다. %d초 후 재시도합니다."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "소켓을 여는데 실패했습니다(%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "호스트와 연결을 수립하는데 실패했습니다(%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "요청을 보내는데 실패했습니다 (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "데이터를 받는데 실패(%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "내용의 길이가 부족합니다"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "내용의 길이를 파악할 수 없습니다."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "받은 내용이 없습니다."
 
-#: ../panel-plugin/weather-search.c:148
-#: ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "결과"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "검색 중..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "날씨 위치 코드 검색"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "도시 명칭 또는 우편번호를 입력하십시오"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
-msgstr "제목 없음"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -334,23 +402,23 @@ msgstr ""
 "%s의 날씨정보 입니다.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "좌표\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "고도"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "위도"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "경도"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -358,7 +426,7 @@ msgstr ""
 "\n"
 "시간\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
@@ -367,7 +435,7 @@ msgstr ""
 "\t온도, 바람, 대기, 구름 데이터를 다음에 적용합니다:\n"
 "\t%s\n"
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -382,8 +450,66 @@ msgstr ""
 "\t시작:\t%s\n"
 "\t종료:\t%s\n"
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -391,12 +517,12 @@ msgstr ""
 "\n"
 "기온\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "온도"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -404,21 +530,21 @@ msgstr ""
 "\n"
 "바람\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (보포르 단계 값: %s)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "속도"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "방향"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -426,12 +552,12 @@ msgstr ""
 "\n"
 "강수율\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "강수율 양"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -439,16 +565,16 @@ msgstr ""
 "\n"
 "기압\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "기압"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "습도"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -456,28 +582,28 @@ msgstr ""
 "\n"
 "구름\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "짙은 안개"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "구름 조금"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "구름 적당히"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "구름 많음"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "구름"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -485,246 +611,292 @@ msgstr ""
 "\n"
 "노르웨이 기상청으로부터 온 데이터입니다\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "met.no에게 감사를 표합니다"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "아침"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "점심"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "저녁"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "밤"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "오늘"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "내일"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "%s의 기상정보"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "플러그인 설정에서 지역을 설정해 주시기 바랍니다."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "현재 데이터가 없습니다."
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "자세히(_D)"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "남"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "남남서"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "남서"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "서남서"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "서"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "서북서"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "북서"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "북북서"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "북"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "북북동"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "북동"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "동북동"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "동"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "동남동"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "남동"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "남남동"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "무풍"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "맑음"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "구름 없음"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "조금 흐림"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "곳에 따라 흐림"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "흐림"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "맑음, 소나기"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "구름 없음, 소나기"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "맑음, 천둥번개를 동반한 소나기"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "구름 없음, 천둥번개를 동반한 소나기"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "맑음, 진눈깨비"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "구름 없음, 진눈깨비"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "맑음, 눈"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "구름 없음, 눈"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "소나기"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "비"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "뇌우"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "진눈깨비"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "눈"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "뇌설"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "맑음, 눈"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "구름 없음, 눈"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "맑음, 진눈깨비와 천둥번개"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "구름 없음, 진눈깨비와 천둥번개"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "맑음, 눈과 천둥번개"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "구름 없음, 진눈깨비와 천둥번개"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "소나기와 천둥번개"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "진눈깨비와 천둥번개"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "무풍"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "알 수 없음"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "현재 날씨 상태를 보입니다"
 
+#~ msgid "Untitled"
+#~ msgstr "제목 없음"
+
 #, fuzzy
 #~ msgid "Overall cloudiness (C)"
 #~ msgstr "변동이 심한 구름"
diff --git a/po/lt.po b/po/lt.po
index 7fbee10..a033250 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-wheather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-01-21 15:46+0200\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas at gmail.com>\n"
 "Language-Team: Lietuvių <>\n"
@@ -19,325 +19,398 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "A"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "VK"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "D"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "MD"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "VD"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "DD"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 #, fuzzy
 msgid "C"
 msgstr "MD"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "R"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "A"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nepavyko atnaujinti duomenų apie orą"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Nepavyko atverti šio url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Orų tarnyba"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Prognozė"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatūra (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosferos slėgis (A)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vėjo greitis (V)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Vėjo greitis - Boforto skalė (VB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Vėjo kryptis (VK)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Vėjo kryptis laipsniais (VK)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Santykinis drėgnumas (D)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Mažas debesuotumas (MD)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Vidutinis debesuotumas (VD)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Didelis debesuotumas (DD)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Šiek tiek debesuota"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "Rūkas (R)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "Krituliai (K)"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Nenustatyta"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Įveskite tarpinio serverio nustatymus"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Įveskite tarpinio serverio nustatymus"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Aptinkama..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Matų sistema:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperinė"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrinė"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Vietovė:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Keisti..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Tarpinis serveris:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Naudoti tarpinį serverį"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automatiškai sužinoti iš aplinkos"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Rodomi duomenys"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animuoti duomenų pasikeitimą"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 #, fuzzy
 msgid "in"
 msgstr "Lietus"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Nepavyko gauti kompiuterio vardo %s. Bandykite dar kartą po %d sekundžių."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Nepavyko atverti lizdo (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Nepavyko sukurti jungties su kompiuteriu (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Nepavyko išsiųsti užklausos (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Nepavyko gauti duomenų (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Turinys neigiamo ilgio"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Nepavyko nustatyti turinio ilgio."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Duomenų negauta."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Rezultatai"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Ieškoma..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Ieškoti vietovės kodo"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Įveskite miesto pavadinimą arba pašto kodą"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "Orų ataskaita: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "Temperatūra\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatūra"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "Vėjas\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Greitis"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Kryptis"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "Krituliai (K)"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "Krituliai (K)"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,45 +574,45 @@ msgstr ""
 "\n"
 "Atmosferos slėgis\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Slėgis"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Drėgmė"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Šiek tiek debesuota"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Rūkas"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Mažai debesuota"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Vidutiniškai debesuota"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Labai debesuota"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Šiek tiek debesuota"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -489,254 +620,297 @@ msgstr ""
 "\n"
 "Duomenys gauti iš Norvegijos meteorologijos instituto\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Naktį: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Orų ataskaita: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Įveskite tarpinio serverio nustatymus"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detalės"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "P"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "PPV"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "PV"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "VPV"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "VŠV"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "ŠV"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ŠŠV"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "Š"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ŠŠR"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "ŠR"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "RŠR"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "R"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "RPR"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "PR"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "PPR"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "RAMUS"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Saulėta"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Nedebesuota"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Silpnai debesuota"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Kai kur debesuota"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Debesuota"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "Saulėta, lietus"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Saulėta, lietus"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "Saulėta, lietus su perkūnija"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 #, fuzzy
 msgid "Clear, rain showers with thunder"
 msgstr "Saulėta, lietus su perkūnija"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 #, fuzzy
 msgid "Sunny, sleet"
 msgstr "Lietus, šlapdriba"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Saulėta, sniegas"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Debesys nyksta"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Trumpalaikiai lietūs"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Lietus"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Lietus su perkūnija"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Šlapdriba"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Sniegas"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "Sniegas su perkūnija"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Saulėta, sniegas"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Smarkiai sninga"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "Saulėta, šlapdriba ir perkūnija"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 #, fuzzy
 msgid "Clear, sleet and thunder"
 msgstr "Šlapdriba ir perkūnija"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "Saulėta, šlapdriba ir perkūnija"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 #, fuzzy
 msgid "Clear, snow and thunder"
 msgstr "Saulėta, šlapdriba ir perkūnija"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "Trumpalaikiai lietūs su perkūnija"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "Šlapdriba ir perkūnija"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "ramu"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Rodyti dabartines oro sąlygas"
 
diff --git a/po/lv.po b/po/lv.po
index 055e0ae..ae42d3f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-09-18 23:43+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -20,329 +20,402 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VĀ"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "R"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Mierīgs"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Mierīgs"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "S"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nevar atjaunināt laikapstākļu datus"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Nevar atvērt url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Laikapstākļu atjaunināšana"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Laika prognoze"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatūra (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosfēras spiediens (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vēja ātrums (VĀ)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Vēja virziens (VV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Vēja virziens (VV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Mitrums (M)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Mākoņi"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Skaidrs"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Galvenokārt mākoņains"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Mākoņi"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Nokrišņi</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Riet"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Lūdzu ievadiet starpnieka servera uzstādījumus"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Lūdzu ievadiet starpnieka servera uzstādījumus"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Notiek noteikšana..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Mērvienība:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Impērijas"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metriskā"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Atrašanās vieta:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Mainīšana..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Starpnieka serveris:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Izmantot starpnieka serveri"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automātiski noteikt no vides"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Attēlojamās etiķetes"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Izmantot pārejas animāciju starp etiķetēm"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Neizdevās iegūt resursdatoru \"%s\". Atkārtots mēģinājums pēc %d sekundēm."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Neizdevās atvērt ligzdu (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Neizdevās izveidot savienojumu ar resursdatoru (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Neizdevās aizsūtīt pieprasījumu (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Neizdevās saņemt datus (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Nevar noteikt satura garumu."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Saturs netika saņemts."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Rezultāti"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Meklēšana..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Meklēt laikapstākļu atrašanās kodu"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Ievadiet pilsētas vārdu vai ASV pasta indeksa kodu"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -351,36 +424,36 @@ msgstr ""
 "Laika ziņas: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -390,8 +463,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -399,12 +530,12 @@ msgstr ""
 "\n"
 "Temperatūra\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatūra"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -412,34 +543,34 @@ msgstr ""
 "\n"
 "Vējš\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Ātrums"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Virziens"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Nokrišņi</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Nokrišņi</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -448,303 +579,346 @@ msgstr ""
 "\n"
 "Atmosfēras spiediens\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Spiediens"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Mitrums"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Mākoņi"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Migla"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Mākoņi"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Mākoņi"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Nakts: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Laika ziņas: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Lūdzu ievadiet starpnieka servera uzstādījumus"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaļas"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "D"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "DDR"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "DR"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "RDR"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "R"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "RZR"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "ZR"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ZZR"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "Z"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ZZA"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "ZA"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "AZA"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "A"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ADA"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "DA"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "DDA"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Mierīgs"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Saulains"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Skaidrs"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Galvenokārt mākoņains"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Daļējs mākoņains"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Mākoņains"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Smaga īslaicīgs lietus"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Smaga īslaicīgs lietus"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Saulains"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Skaidrojas"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Īslaicīgs lietus"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Lietus"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Lietus / Pērkons"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Sniegs"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Saulains"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Spēcīgs sniegs"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Lietus / Pērkons"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Slapjdraņķis un sniegs"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "mierīgs"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "NAV ZINĀMS"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Rādīt tagadējos laika apstākļus"
 
diff --git a/po/nb.po b/po/nb.po
index 66a3e98..62f477f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0svn-r2842\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2007-07-02 00:53+0200\n"
 "Last-Translator: Christian Lomsdalen <christian at vindstille.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb at lister.ping.uio.no>\n"
@@ -18,328 +18,401 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "AS"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VH"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "VR"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Rolig"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Rolig"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "OT"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Klarte ikke oppdatere vinddata"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Klarte ikke åpne url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Væroppdatering"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Værvarsel"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosfærisk trykk (AT)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vindhastighet (VH)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Vindretning (VR)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Vindretning (VR)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Fuktighet (F)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Variabelt skydekke"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "For det meste skyet"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Fortettet</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Ikke satt"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Skriv inn mellomtjenerinnstillinger"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Skriv inn mellomtjenerinnstillinger"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detekterer..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Måleenheter:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Lokasjon:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Endre..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Mellomtjener:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Bruk mellomtjener"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automatisk detektering"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Viste etiketter"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animer transformasjon mellom etiketter"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/t"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Fikk ikke tak i vertsnavnet %s. Prøv igjen om %d sekunder."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Klarte ikke å åpne kontakten (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Klarte ikke å opprette tilkoblingen med verten (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Klarte ikke å sende spørringen (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Klarte ikke å motta noe informasjon (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Klarte ikke å beregne innholdets lengde."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Ikke mottatt noe innhold."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultater"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Søker..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Søk på værplasseringskode"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Skriv inn et bynavn eller postnummer"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -348,36 +421,36 @@ msgstr ""
 "Værrapport for for: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -387,8 +460,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -396,12 +527,12 @@ msgstr ""
 "\n"
 "Temperatur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -409,34 +540,34 @@ msgstr ""
 "\n"
 "Vind\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Retning"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Fortettet</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Fortettet</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -445,303 +576,346 @@ msgstr ""
 "\n"
 "Atmosfærisk trykk\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Trykk"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Fuktighet"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Tåke"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Natt: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Værrapport for: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Skriv inn mellomtjenerinnstillinger"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaljer"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSV"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SV"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "VSV"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "VNV"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NV"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNV"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNØ"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NØ"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ØNØ"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "Ø"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ØSØ"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SØ"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSØ"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Rolig"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Klart"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "For det meste skyet"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Delvis skyet"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Skyet"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Kraftige regnbyger"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Kraftige regnbyger"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Oppklaring"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Regnbyger"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Regn"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Regn/torden"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Snø"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Kraftig snøvær"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Regn/torden"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Slaps og snø"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "rolig"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "I/T"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Vis gjeldende værforhold"
 
diff --git a/po/nl.po b/po/nl.po
index 903b086..d53763e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2011-09-09 13:07+0200\n"
 "Last-Translator: Pjotr\n"
 "Language-Team: Dutch (Flemish)\n"
@@ -18,309 +18,384 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "D"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "WB"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WR"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "LB"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "MW"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "HW"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "VB"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "G"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "R"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "Geen gegevens"
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Kan weerinformatie niet bijwerken"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Kon het volgende webadres niet openen: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Weerbericht"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "Thans geen gegevens beschikbaar."
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Verwachting"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatuur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Luchtdruk (D)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Windsnelheid (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Windsnelheid - schaal van Beaufort (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Windrichting (WR)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Windrichting in graden (WG)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Luchtvochtigheid (V)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "Laaghangende bewolking (LB)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "Middelhoge wolken (MW)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "Hoge wolken (HW)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "Bewolking (B)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "Mist (M)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "Neerslag (R)"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Niet meer ingesteld"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Voer a.u.b. proxy-instellingen in"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr ""
+"Stel a.u.b. in de instellingen van de invoegtoepassing, een locatie in."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Aan het detecteren..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "Meetsysteem:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrisch"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "Locatie:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "Veranderen..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "Proxy-server:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "Proxy-server gebruiken"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "Automatisch detecteren vanuit omgeving"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "Aantal voorspelde dagen:"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "Te tonen etiketten"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "_Toevoegen"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "Omhoog"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "Omlaag"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "Animeer de overgangen tussen etiketten"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "ft"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/u"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Kon de hostnaam %s niet verkrijgen. Probeer opnieuw over %d seconden."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Kon het contactpunt niet openen (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Kon geen verbinding maken met de host (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Kon het verzoek niet verzenden (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Kon geen gegevens ontvangen (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negatieve inhoudlengte"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Kon de inhoudlengte niet bepalen."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Geen inhoud ontvangen."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultaten"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Aan het zoeken..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Zoek locatiecode voor het weer"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Voer een plaatsnaam of postcode in"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
-msgstr "Zonder titel"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -329,23 +404,23 @@ msgstr ""
 "Weerbericht voor: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "Coördinaten\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "Hoogte"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "Breedtegraad"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "Lengtegraad"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -353,15 +428,17 @@ msgstr ""
 "\n"
 "Tijd\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
-msgstr "\tGegevens voor temperatuur, wind, luchtdruk en bewolking zijn van toepassing op:\n"
+msgstr ""
+"\tGegevens voor temperatuur, wind, luchtdruk en bewolking zijn van "
+"toepassing op:\n"
 "\t%s\n"
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -369,14 +446,73 @@ msgid ""
 "\tfor the following time interval:\n"
 "\tStart:\t%s\n"
 "\tEnd:\t%s\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "\tNeerslag en het weersymbool zijn berekend\n"
 "\tvoor het volgende tijdvak:\n"
 "\tBegin:\t%s\n"
 "\tEinde:\t%s\n"
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -384,12 +520,12 @@ msgstr ""
 "\n"
 "Temperatuur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatuur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -397,21 +533,21 @@ msgstr ""
 "\n"
 "Wind\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s op de schaal van Beaufort)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Snelheid"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Richting"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -419,12 +555,12 @@ msgstr ""
 "\n"
 "Neerslag\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "Hoeveelheid neerslag"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -432,16 +568,16 @@ msgstr ""
 "\n"
 "Luchtdruk\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Druk"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Luchtvochtigheid"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -449,28 +585,28 @@ msgstr ""
 "\n"
 "Wolken\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Mist"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Laaghangende wolken"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Gemiddelde wolken"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Hoge wolken"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "Bewolking"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -478,247 +614,293 @@ msgstr ""
 "\n"
 "Gegevens van het Noorse Meteorologische Instituut\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "met dank aan met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "Ochtend"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "Middag"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "Avond"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Nacht"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Weerbericht voor: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr ""
 "Stel a.u.b. in de instellingen van de invoegtoepassing, een locatie in."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "Thans geen gegevens beschikbaar."
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Details"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "Z"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "ZZW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "ZW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WZW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "OZO"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "ZO"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "ZZO"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "RUSTIG"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Zonnig"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Helder"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Licht bewolkt"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Half bewolkt"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Bewolkt"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "Zonnig, regenbuien"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "Helder, regenbuien"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "Zonnig, onweersbuien"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "Helder, onweersbuien"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "Zonnig, natte sneeuw"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "Helder, natte sneeuw"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "Zonnig, sneeuw"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "Helder, sneeuw"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Regenbuien"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Regen"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Regen met onweer"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Natte sneeuw"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Sneeuw"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "Sneeuw met onweer"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Zonnig, sneeuw"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "Helder, sneeuw"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "Zonnig, natte sneeuw en onweer"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "Helder, natte sneeuw en onweer"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "Zonnig, sneeuw en onweer"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "Helder, sneeuw en onweer"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "Regenbuien met onweer"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "Natte sneeuw en onweer"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "rustig"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/B"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Toon huidige weersomstandigheden"
 
+#~ msgid "Untitled"
+#~ msgstr "Zonder titel"
+
 #~ msgid ""
 #~ "\tPoint data applies to:\n"
 #~ "\t%s\n"
diff --git a/po/nn.po b/po/nn.po
index 30f6637..c27e4fe 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0svn-r2842\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-01-15 17:11+0100\n"
 "Last-Translator: Kevin Brubeck Unhammer <unhammer at fsfe.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nb at lister.ping.uio.no>\n"
@@ -15,328 +15,401 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "AS"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VF"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "VR"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Roleg"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Roleg"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "OT"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Klarte ikkje oppdatera vinddata"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Klarte ikkje opna url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Vêroppdatering"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_vêrvarsel"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosfærisk trykk (AT)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vindfart (VF)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Vindretning (VR)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Vindretning (VR)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Fukt (F)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Variabelt skydekke"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "For det meste skya"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Bøyer</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Ikkje sett"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Skriv inn mellomtenarinnstillingar"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Skriv inn mellomtenarinnstillingar"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Oppdagar …"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Måleeining:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Britisk imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Stad:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Endra …"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Mellomtenar:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Nytt mellomtenar"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automatisk oppdaging"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etikettar å visa"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animer overgangen mellom etikettar"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "KM/t"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Fekk ikkje tak i vertsnamnet %s. Prøv igjen om %d sekund."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Klarte ikkje å opna kontakten (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Klarte ikkje å oppretta tilkoplinga med verten (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Klarte ikkje å senda spørjinga (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Klarte ikkje å motta noko informasjon (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negativ innhaldslengd"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Klarte ikkje å rekna ut lengda til innhaldet."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Mottok ikkje noko innhald."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultat"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Søkjer …"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Søk på vêrplasseringskode"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Skriv inn eit bynamn eller postnummer"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -345,36 +418,36 @@ msgstr ""
 "Vêrrapport for: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -384,8 +457,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -393,12 +524,12 @@ msgstr ""
 "\n"
 "Temperatur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -406,34 +537,34 @@ msgstr ""
 "\n"
 "Vind\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Fart"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Retning"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Bøyer</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Bøyer</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -442,303 +573,346 @@ msgstr ""
 "\n"
 "Atmosfærisk trykk\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Trykk"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Fukt"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Tåke"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Skyer"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Natt: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Vêrrapport for: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Skriv inn mellomtenarinnstillingar"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaljar"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSV"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SV"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "VSV"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "VNV"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NV"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNV"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNA"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NA"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ANA"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "A"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ASA"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SA"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSA"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Roleg"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Klårt"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "For det meste skya"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Til dels skya"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Skya"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Kraftige regnbøyer"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Kraftige regnbøyer"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Oppklåring"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Regnbøyer"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Regn"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Regn / tore"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Snø"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Sol"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Kraftig snøvêr"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Regn / tore"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Sludd og snø"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "roleg"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "I/T"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Vis gjeldande vêrforhold"
 
diff --git a/po/pa.po b/po/pa.po
index 0a8d42d..3942757 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2007-04-11 08:14+0530\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <xfce-i18n at xfce.org>\n"
@@ -18,324 +18,396 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "ਮੌਸਮ ਡਾਟਾ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr ""
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "ਮੌਸਮ ਅੱਪਡੇਟ"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 #, fuzzy
 msgid "_Forecast"
 msgstr "ਅਨੁਮਾਨ"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "ਤਾਪਮਾਨ (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "ਹਵਾ ਸਪੀਡ (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "ਨਮੀਂ (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "ਬੱਦਲਵਾਈ"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "ਬਦਲਵੀਂ ਬੱਦਲਵਾਈ"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "ਬੱਦਲਵਾਈ"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>ਗੜ੍ਹੇ</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "ਪਰਾਕਸੀ ਸਥਾਪਨ ਦਿਓ ਜੀ:"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "ਪਰਾਕਸੀ ਸਥਾਪਨ ਦਿਓ ਜੀ:"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "ਮਿਣਤੀ ਇਕਾਈ:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "ਮੈਟਰਿਕ"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "ਟਿਕਾਣਾ ਕੋਡ:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr ""
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "ਪਰਾਕਸੀ ਸਰਵਰ:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "ਪਰਾਕਸੀ ਸਰਵਰ ਵਰਤੋਂ"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "ਵਾਤਾਵਰਨ ਤੋਂ ਆਟੋ-ਖੋਜ"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "ਵੇਖਾਉਣ ਲਈ ਲੇਬਲ"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
+#: ../panel-plugin/weather-http.c:239
 #, c-format
-msgid "Failed to open the socket (%s)."
+msgid "Failed to open the socket(%s)."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
+#: ../panel-plugin/weather-http.c:245
 #, c-format
-msgid "Failed to create a connection with the host (%s)."
+msgid "Failed to create a connection with the host(%s)."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
+#: ../panel-plugin/weather-http.c:282
 #, c-format
-msgid "Failed to send the request (%s)."
+msgid "Failed to send the request(%s)."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
+#: ../panel-plugin/weather-http.c:330
 #, c-format
-msgid "Failed to receive data (%s)"
+msgid "Failed to receive data(%s)"
 msgstr ""
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr ""
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "ਨਤੀਜਾ"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "ਮੌਸਮ ਟਿਕਾਣਾ ਕੋਡ ਖੋਜ"
 
-#: ../panel-plugin/weather-search.c:253
+#: ../panel-plugin/weather-search.c:245
 #, fuzzy
-msgid "Enter a city name or zip code"
+msgid "Enter a city name or address"
 msgstr "ਸ਼ਹਿਰ ਨਾਂ ਜਾਂ ਜ਼ਿਪ ਕੋਡ ਦਿਓ:"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -344,36 +416,36 @@ msgstr ""
 "ਮੌਸਮ ਰਿਪੋਰਟ: %s\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -383,8 +455,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -392,12 +522,12 @@ msgstr ""
 "\n"
 "ਤਾਪਮਾਨ\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "ਤਾਪਮਾਨ"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -405,34 +535,34 @@ msgstr ""
 "\n"
 "ਹਵਾ\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "ਗਤੀ"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "ਦਿਸ਼ਾ"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>ਗੜ੍ਹੇ</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>ਗੜ੍ਹੇ</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -441,301 +571,344 @@ msgstr ""
 "\n"
 "ਵਾਤਾਵਰਨ ਦਬਾਓ\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "ਪ੍ਰੈਸ਼ਰ"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "ਨਮੀ"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "ਬੱਦਲਵਾਈ"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "ਧੁੰਦ"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "ਬੱਦਲਵਾਈ"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "ਬੱਦਲਵਾਈ"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "ਰਾਤ: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "ਮੌਸਮ ਜਾਣਕਾਰੀ: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "ਪਰਾਕਸੀ ਸਥਾਪਨ ਦਿਓ ਜੀ:"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "ਖਿੜੀ ਧੁੱਪ"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "ਸਾਫ਼"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "ਅਧੂਰਾ ਚਮਕਦਾ ਦਿਨ"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "ਮੀਂਹ ਵਾਛੜ"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "ਮੀਂਹ ਵਾਛੜ"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "ਖਿੜੀ ਧੁੱਪ"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "ਸਾਫ਼"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "ਮੀਂਹ ਵਾਛੜ"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "ਮੀਂਹ"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "ਮੀਂਹ / ਤੂਫਾਨ"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "ਬਰਫ਼ਬਾਰੀ"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "ਖਿੜੀ ਧੁੱਪ"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "ਭਾਰੀ ਬਰਫ਼ਬਾਰੀ"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "ਮੀਂਹ / ਤੂਫਾਨ"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "ਬਰਫ਼ੀਲਾ ਮੀਂਹ ਅਤੇ ਬਰਫ਼"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "ਸ਼ਾਂਤ"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/A"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "ਮੌਜੂਦਾ ਮੌਸਮ ਹਾਲਤ ਵੇਖਾਓ"
 
diff --git a/po/pl.po b/po/pl.po
index cb2669c..455b3b1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2011-04-11 21:43+0200\n"
 "Last-Translator: Piotr Sokół <psokol at jabster.pl>\n"
 "Language-Team: Polish <>\n"
@@ -19,330 +19,403 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
 "%100<10 || n%100>=20)) ? 1 : 2));\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "PW"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "KW"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nie można zaktualizować danych pogodowych"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Nie można otworzyć adresu URL: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Pogoda"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Prognoza"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Ciśnienie atmosferyczne (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Prędkość wiartu (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Kierunek wiatru (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Kierunek wiatru (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Wilgotność (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Chmury"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Duże zachmurzenie"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Chmury"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Opady</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 #, fuzzy
 msgid "Unset"
 msgstr "Nie ustawiono"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Proszę wprowadzić ustawienia pośrednika"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Proszę wprowadzić ustawienia pośrednika"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Wykrywanie..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Jednostki pomiarowe:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperialne"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metryczne"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Położenie:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Zmień..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Serwer pośredniczący:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Używanie"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automatyczne wykrywanie"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Wyświetlane etykiety"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animowanie zmian etykiet"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "M/h"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Nie udało się uzyskać nazwy komputera „%s”. Kolejna próba nastąpi za %d "
 "sekund."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Nie udało się otworzyć gniazda (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Nie udało się utworzyć połączenia z komputerem (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Nie udało się wysłać żądania (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Nie udało się odebrać danych (%s)."
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Nieprawidłowa długość zawartości"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Nie można wykryć długości zawartości."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nie otrzymano zawartości."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Wyniki"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Położenie"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr ""
 "Wyszukuje położenie na podstawie nazwy\n"
 "lub kodu pocztowego miasta"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -351,36 +424,36 @@ msgstr ""
 "Raport dla miasta: %s\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -390,8 +463,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -399,12 +530,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -412,34 +543,34 @@ msgstr ""
 "\n"
 "Wiatr\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Prędkość"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Kierunek"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Opady</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Opady</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -448,303 +579,346 @@ msgstr ""
 "\n"
 "Ciśnienie atmosferyczne\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Ciśnienie"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Wilgotność"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Chmury"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Mgła"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Chmury"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Chmury"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Noc: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Miasto: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Proszę wprowadzić ustawienia pośrednika"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Szczegóły"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Słonecznie"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Pogodnie"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Duże zachmurzenie"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Umiarkowane zachmurzenie"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Pochmurnie"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Silny przelotny deszcz"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Silny przelotny deszcz"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Słonecznie"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Wypogodzenie"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Przelotny deszcz"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Deszcz"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Deszcz / grzmoty"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Śnieg"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Słonecznie"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Silny śnieg"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Deszcz / grzmoty"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Ziarna lodowe i śnieg"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "brak danych"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Wyświetla bieżące warunki pogodowe"
 
diff --git a/po/pt.po b/po/pt.po
index cafac44..73e9f55 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,327 +2,400 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Nuno Miguel <nunis at netcabo.pt>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-17 15:53-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "WB"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "DV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "PN"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "N"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "MN"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "NG"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "N"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "Sem dados"
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Incapaz de atualizar os dados"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Incapaz de abrir o url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Atualização climatérica"
 
-#. add refresh button to right click menu, for people who missed the middle
-#. mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "Atualmente, não existem dados."
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Previsão"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Pressão atmosférica (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocidade do vento (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Velocidade do vento - Escala Beaufort (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Direção do vento (DV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Direção do vento em graus (DV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Humidade (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "Pouco nublado (PN)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "Nublado (N)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "Muito nublado (MN)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "Neblina (NG)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "Nevoeiro (N)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "Precipitação (P)"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Não definido"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Por favor indique as definições do proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Por favor indique a sua localização nas definições."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "A detetar..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "Sistema de _medida:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "L_ocalização:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "Al_terar..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "Servidor _proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "Utilizar _servidor proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "Det_etar automaticamente"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "N.º de dias a prever:"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "_Campos a exibir"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "Mover para _cima"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "Mover para _baixo"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "Animar _transições entre campos"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "pés"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "pol"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Falha ao obter o nome do servidor %s. Tente em %d segundos."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Falha ao abrir o \"socket\" (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Falha ao criar ligação ao servidor (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Falha ao enviar o pedido (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Falha ao receber os dados (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Dimensão do conteúdo negativo"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Incapaz de detetar o conteúdo."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nenhum conteúdo recebido."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultados"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "A procurar..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Procurar código de localização"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Indique a cidade ou código postal"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
-msgstr "Sem nome"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -331,23 +404,23 @@ msgstr ""
 "Relatório meteorológico para: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "Coordenadas\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "Altitude"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "Latitude"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "Longitude"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -355,7 +428,7 @@ msgstr ""
 "\n"
 "Hora\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
@@ -364,7 +437,7 @@ msgstr ""
 "\tOs dados de temperatura, vento, atmosfera e nuvens são aplicáveis a:\n"
 "\t%s\n"
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -379,8 +452,66 @@ msgstr ""
 "\tInicio:\t%s\n"
 "\tFim:\t%s\n"
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -388,12 +519,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -401,21 +532,21 @@ msgstr ""
 "\n"
 "Vento\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s na escala Beaufort)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direção"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -423,12 +554,12 @@ msgstr ""
 "\n"
 "Precipitação\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "Valor da precipitação"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -436,16 +567,16 @@ msgstr ""
 "\n"
 "Pressão atmosférica\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Pressão"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Humidade"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -453,28 +584,28 @@ msgstr ""
 "\n"
 "Nuvens\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Nevoeiro"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Nuvens ligeiras"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Nuvens"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Nuvens intensas"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "Neblina"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -482,246 +613,292 @@ msgstr ""
 "\n"
 "Dados disponibilizados pelo Instituto de Meteorologia da Noruega\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "Agradecimentos a met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "Manhã"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "Fim de dia"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Noite"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "Hoje"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "Amanhã"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Relatório meteorológico para: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "Por favor indique a sua localização nas definições."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "Atualmente, não existem dados."
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Detalhes"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Calmo"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Soalheiro"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Céu limpo"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Pouco nublado"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Parcialmente nublado"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "Soalheiro e aguaceiros"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "Céu limpo e aguaceiros"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "Soalheiro, aguaceiros e trovoada"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "Céu limpo, aguaceiros e trovoada"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "Soalheiro e geada"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "Céu limpo e geada"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "Soalheiro e neve"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "Céu limpo e neve"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Aguaceiros"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Chuva"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Chuva e trovoada"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Geada"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Neve"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "Neve e trovoada"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Soalheiro e neve"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "Céu limpo e neve"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "Soalheiro, geada e trovoada"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "Céu limpo, geada e trovoada"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "Soalheiro, neve e trovoada"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "Céu limpo, neve e trovoada"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "Aguaceiros e trovoada"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "Geada e trovoada"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calmo"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mostrar condições meteorológicas atuais"
 
+#~ msgid "Untitled"
+#~ msgstr "Sem nome"
+
 #~ msgid ""
 #~ "\tPoint data applies to:\n"
 #~ "\t%s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f40364..b797c7e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin (XFCE 4.4 Goodies)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-15 14:10-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -19,323 +19,397 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 #, fuzzy
 msgid "P"
 msgstr "PA"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "VV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "O"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "DV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "U"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "NB"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "NM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "NA"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "N"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 #, fuzzy
 msgid "R"
 msgstr "PC"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "Nenhum dado"
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Não foi possível atualizar dados climáticos"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Não foi possível abrir a seguinte url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Atualização do clima"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "Nenhum dado disponível no momento."
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "Previsão"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatura (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 #, fuzzy
 msgid "Atmosphere pressure (P)"
 msgstr "Pressão atmosférica (PA)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Velocidade do vento (VV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Velocidade do vento - escala de Beaufort (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Direção do vento (DV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Direção do vento em graus(DV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Umidade (U)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Nuvens baixas (NB)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Nuvens médias (NM)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Nuvens altas (NA)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Nuvens"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 #, fuzzy
 msgid "Fog (F)"
 msgstr "Neblina (N)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "Preciptações (PC)"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Não definido"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Por favor entre com as configurações de proxy"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Por favor, entre com uma localização nas configurações do plugin."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Detectando..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "Unidade de _medida:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Métrica"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Localização:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "_Alterar..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Servidor proxy:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "_Usar um servidor proxy"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "Auto-detecção através do ambiente"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "Nº de dias de previsão:"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "Rótu_los a ser exibidos"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "_Animar as transições entre os rótulos"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "ft"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "pol"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Falhou ao obter o nome da máquina %s. Tente novamente em %d segundos."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Falhou ao abrir o soquete (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Falhou ao criar uma conexão com a máquina (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Falhou ao enviar pedido (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Falhou no recebimento de dados (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Comprimento de conteúdo negativo"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Não foi possível detectar o tamanho do conteúdo."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nenhum conteúdo recebido."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultados"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Pesquisando..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Procurar código de localização de clima"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Entre com um nome de cidade ou código postal (CEP)"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -344,23 +418,23 @@ msgstr ""
 "Relatório meteorológico para: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "Coordenadas\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "Altitude"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "Latitude"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "Longitude"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -368,14 +442,14 @@ msgstr ""
 "\n"
 "Tempo\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +459,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +526,12 @@ msgstr ""
 "\n"
 "Temperatura\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatura"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,21 +539,21 @@ msgstr ""
 "\n"
 "Vento\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s na escala de Beaufort)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Direção"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -429,12 +561,12 @@ msgstr ""
 "\n"
 "Preciptações\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "Quantidade de preciptações"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -442,16 +574,16 @@ msgstr ""
 "\n"
 "Atmosfera\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Pressão"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Umidade"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -459,28 +591,28 @@ msgstr ""
 "\n"
 "Nuvens\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Neblina"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Nuvens baixas"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Nuvens médias"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Nuvens altas"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "Nuvens"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -488,243 +620,286 @@ msgstr ""
 "\n"
 "Dados do Instituto de Meteorologia Norueguês\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "Agradecimentos ao met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "Manhã"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "Noite"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Noite"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "Hoje"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "Amanhã"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Relatório meteorológico para: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "Por favor, entre com uma localização nas configurações do plugin."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "Nenhum dado disponível no momento."
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Detalhes"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "CALMO"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Ensolarado"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Limpo"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Levemente nublado"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Parcialmente nublado"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Nublado"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "Ensolarado, com pancadas de chuvas"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "Sem nuvens, com pancadas de chuvas"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "Ensolarado, com pancadas de chuvas com relâmpago"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "Limpo, com pancadas de chuvas com relâmpago"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "Ensolarado, com preciptações"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "Sem nuvens, com preciptações"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "Ensolarado, com neve"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "Sem nuvens, com neve"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Pancadas de chuvas"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Chuva"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Chuva com relâmpago"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Preciptações"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Neve"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "Neve com relâmpago"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Ensolarado, com neve"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "Sem nuvem, com neve"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "Ensolarado, com preciptações e relâmpago"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "Sem nuvens, com preciptações e relâmpago"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "Ensolarado, com neve e relâmpago"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "Sem nuvens, com neve e relâmpago"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "Chuvas passageiras com relâmpago"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "Preciptações com relâmpago"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "calmo"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/D"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mostra condições climáticas atuais"
 
diff --git a/po/ru.po b/po/ru.po
index 1de1b73..57d6c45 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-25 00:19+0300\n"
 "Last-Translator: Jenea Derevyankin <jekader at gmail.com>\n"
 "Language-Team: Russian\n"
@@ -15,328 +15,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "Т"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "Д"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "СВ"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "З"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "НВ"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "В"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "В"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "КТ"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Не удалось обновить данные о погоде"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Невозможно открыть ссылку %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Погода"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Прогноз"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Температура (Т)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Давление (Д)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Скорость ветра (СВ)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Направление ветра (НВ)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Направление ветра (НВ)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Влажность (В)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Отдельные облака"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Переменная облачность"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "В основном облачно"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Отдельные облака"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Осадки</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Неизвестно"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Укажите параметры прокси-сервера"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Укажите параметры прокси-сервера"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Обнаружение..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Единицы измерения:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "английские"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "метрические"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Месторасположение:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Изменить..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Прокси-сервер:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Использовать прокси-сервер"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Определять настройки автоматически"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Отображать показания"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Анимировать переходы между показаниями"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "км"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "гПа"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "миль/ч"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "км/ч"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "в"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Не удалось найти имя узла %s. Следующая попытка через %d сек."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Невозможно открыть сокет (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Невозможно подключиться к серверу (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Невозможно отправить запрос (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Невозможно получить данные (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Отрицательная длина содержимого"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Невозможно определить размер полученных данных."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Информация не получена."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Результаты"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Поиск..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Поиск кода месторасположения"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Введите название города (на английском) или индекс"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -345,36 +418,36 @@ msgstr ""
 "Погода — %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -384,8 +457,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -393,12 +524,12 @@ msgstr ""
 "\n"
 "Температура\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Температура"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -406,34 +537,34 @@ msgstr ""
 "\n"
 "Ветер\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Скорость"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Направление"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Осадки</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Осадки</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -442,303 +573,346 @@ msgstr ""
 "\n"
 "Атмосферное давление\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Давление"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Влажность"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Отдельные облака"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Туман"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Отдельные облака"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Отдельные облака"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Ночь: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Погода - %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Укажите параметры прокси-сервера"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Подробнее"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "Ю"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "ЮЮЗ"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "ЮЗ"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ЗЮЗ"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "З"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ЗСЗ"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "СЗ"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ССЗ"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "С"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ССВ"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "СВ"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ВСВ"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "В"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ВЮВ"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "ЮВ"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "ЮЮВ"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Солнечно"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Ясно"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "В основном облачно"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Временами облачно"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Облачно"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Сильный ливень"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Сильный ливень"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Солнечно"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Будет ясно"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Ливень"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Дождь"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Дождь и гроза"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Снег"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Солнечно"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Сильный снег"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Дождь и гроза"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Дождь со снегом, затем снег"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "безветрено"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "нет данных"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Показать текущую погоду"
 
diff --git a/po/sk.po b/po/sk.po
index fdab634..74553c0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2011-06-01 10:23+0100\n"
 "Last-Translator: Tomáš Vadina <kyberdev at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -20,328 +20,401 @@ msgstr ""
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "RV"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "Z"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "SV"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "BEZVETRIE"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "BEZVETRIE"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nie je možné aktualizovať informácie o počasí"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Nedá sa otvoriť nasledujúca url adresa: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Aktuálny stav počasia"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Predpoveď počasia"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Teplota (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosferický tlak (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Rýchlosť vetra (RV)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Smer vetra (SV)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Smer vetra (SV)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Vlhkosť (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Oblaky"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Premenlivá oblačnosť"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Zväčša zamračené"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Oblaky"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Zrážky</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Nenastavené"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Prosím zadajte nastavenia proxy servera"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Prosím zadajte nastavenia proxy servera"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Zisťuje sa..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Voliteľná jednotka:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Britská"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrická"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Umiestnenie:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Zmeniť..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Proxy server:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Použiť proxy server"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Automatické zistenie z prostredia"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Zobraziť štítky"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animovať prechody medzi štítkami"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Získanie názvu hostiteľa %s zlyhalo. Opakovanie za %d sekúnd."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Nepodarilo sa otvoriť soket (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Vytvorenie spojenia s hostiteľom zlyhalo (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Nepodarilo sa odoslať požiadavku (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Nepodarilo sa získať dáta (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negatívna dĺžka obsahu"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Nedá sa zistiť dĺžka obsahu."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nebol prijatý žiadny obsah."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Výsledky"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Vyhľadávanie..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Vyhľadať kód miesta"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Zadajte názov mesta alebo PSČ:"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -350,36 +423,36 @@ msgstr ""
 "Predpoveď počasia pre: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -389,8 +462,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -398,12 +529,12 @@ msgstr ""
 "\n"
 "Teplota\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Teplota"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -411,34 +542,34 @@ msgstr ""
 "\n"
 "Vietor\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Rýchlosť"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Smer"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Zrážky</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Zrážky</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -447,303 +578,346 @@ msgstr ""
 "\n"
 "Atmosferický tlak\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Tlak"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Vlhkosť"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Oblaky"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Hmla"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Oblaky"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Oblaky"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Noc: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Predpoveď počasia pre: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Prosím zadajte nastavenia proxy servera"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaily"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "J"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "JJZ"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "JZ"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ZJZ"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Z"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ZSZ"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "SZ"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "SSZ"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "SSV"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "SV"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "VSV"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "VJV"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "JV"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "JJV"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "BEZVETRIE"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Slnečno"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Jasno"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Zväčša zamračené"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Polooblačno"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Oblačno"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Dažďové prehánky"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Dažďové prehánky"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Slnečno"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Vyjasnenie"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Dažďové prehánky"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Dážď"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Dážď, búrka"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Krúpy"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Sneženie"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Slnečno"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Husté sneženie"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Dážď, búrka"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Krúpy a sneh"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "bezvetrie"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "Nie je k dispozícii"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Zobraziť aktuálne počasie"
 
diff --git a/po/sq.po b/po/sq.po
index 4f2add9..8b53047 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2008-11-04 23:36+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <xfce-i18n at xfce.org>\n"
@@ -17,326 +17,399 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Nuk përditëson dot të dhëna moti"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "I pazoti të hapë url-në vijuese: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Përditësim Moti"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 #, fuzzy
 msgid "_Forecast"
 msgstr "Parashikimi"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperaturë (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Trysni atmosferike (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Shpejtësi e erës (SHE)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Drejtimi i erës (DE)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Drejtimi i erës (DE)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Lagështi (L)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Re"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Vranësirë e Ndryshueshme"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Më së shumti Vranët"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Re"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Reshje</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Ju lutem jepni rregullime ndërmjetësi"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Ju lutem jepni rregullime ndërmjetësi"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Njësi matëse:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Perandorak"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Kod vendor:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr ""
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Shërbyes ndërmjetës:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Përdor shërbyes ndërmjetës"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Vetëzbuloji prej mjedisit"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etiketa për t'u shfaqur"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, fuzzy, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Dështoi në pasjen e emërstrehës \"%s\". Riprovoni në %d sekonda."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Dështoi në hapjen e \"socket\"-it (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Dështoi në krijimin e lidhjes me strehën (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Dështoi në dërgim kërkese (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Dështoi në marrje të dhënash (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "I pazoti të zbulojë gjatësi lënde."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Nuk u mor lëndë."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Përfundime"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 #, fuzzy
 msgid "Searching..."
 msgstr "E hapët"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Kërko kod vendi për motin"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Jepni emër qyteti ose kod postar"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -345,36 +418,36 @@ msgstr ""
 "Raport mbi motin në: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -384,8 +457,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -393,12 +524,12 @@ msgstr ""
 "\n"
 "Temperaturë\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperaturë"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -406,34 +537,34 @@ msgstr ""
 "\n"
 "Erë\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Shpejtësi"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Drejtim"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Reshje</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Reshje</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -442,302 +573,345 @@ msgstr ""
 "\n"
 "Trysni atmosferike\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Trysni"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Lagështi"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Re"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Mjegull"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Re"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Re"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Natë: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Raport për Motin në: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Ju lutem jepni rregullime ndërmjetësi"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "J"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "JJP"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "JP"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "PJP"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "P"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "PVP"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "VP"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "VVP"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "VVl"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "VL"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "LVL"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "L"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "LJL"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "JL"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "JJL"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Me Diell"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Hapur"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Më së shumti Vranët"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Pjesërisht Me Re"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Me re"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Reshje Shiu"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Reshje Shiu"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Me Diell"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "E hapët"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Reshje Shiu"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Shi"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Shi / Stuhi"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Dëborë"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Me Diell"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Borë Vendçe"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Shi / Stuhi"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Shqotë dhe Dëborë"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "qetë"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/A"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Shfaq kushtet e motit për çastin"
 
diff --git a/po/sv.po b/po/sv.po
index e755c69..1f2702b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2010-10-16 16:21+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -17,329 +17,402 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "V"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "LUGNT"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "LUGNT"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Kan inte uppdatera väderdata"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Kunde inte öppna följande url: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Väderuppdatering"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Prognos"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Temperatur (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosfäriskt tryck (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Vindhastighet (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Vindriktning (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Vindriktning (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Luftfuktighet (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Moln"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Växlande molnighet"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Mestadels molnigt"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Moln"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Nederbörd</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Ta bort"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Ange proxyinställningar"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Ange proxyinställningar"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Identifierar..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Mätenhet:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Empirisk"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Plats:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Ändra..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Proxyserver:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Använd proxyserver"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Identifiera automatiskt från miljön"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Etiketter att visa"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Animera övergångar mellan etiketter"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "engelska mil/h"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 "Misslyckades med att få tag på värdnamnet %s. Försöker igen om %d sekunder."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Misslyckades med att öppna uttaget (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Misslyckades med att skapa en anslutning till värden (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Misslyckades med att skicka begäran (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Misslyckades med att ta emot data (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Negativ innehållslängd"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Kunde inte detektera innehållslängden."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Inget innehåll togs emot."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Resultat"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Söker..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Sök efter väderplatskod"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Ange en stad eller postnummer"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -348,36 +421,36 @@ msgstr ""
 "Väderrapport för: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -387,8 +460,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -396,12 +527,12 @@ msgstr ""
 "\n"
 "Temperatur\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Temperatur"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -409,34 +540,34 @@ msgstr ""
 "\n"
 "Vind\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Riktning"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Nederbörd</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Nederbörd</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -445,303 +576,346 @@ msgstr ""
 "\n"
 "Atmosfäriskt tryck\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Tryck"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Luftfuktighet"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Moln"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Dimma"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Moln"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Moln"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Natt: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Väderrapport för: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Ange proxyinställningar"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaljer"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSV"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SV"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "VSV"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "V"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "VNV"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NV"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNV"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNO"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NO"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ONO"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "O"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "OSO"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SO"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSO"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "LUGNT"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Soligt"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Klar himmel"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Mestadels molnigt"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Delvis molnigt"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Molnigt"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Kraftiga regnskurar"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Kraftiga regnskurar"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Soligt"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Uppsprickande"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Regnskurar"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Regn"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Regn / Åskväder"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Snöfall"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Soligt"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Kraftigt snöfall"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Regn / Åskväder"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Snöblandat och snö"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "lugnt"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "-"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Visa aktuella väderförhållanden"
 
diff --git a/po/te.po b/po/te.po
index 5cff803..2751e59 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2011-11-19 19:12+0530\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu at lists.sourceforge.net>\n"
@@ -17,347 +17,417 @@ msgstr ""
 "X-Poedit-Language: Telugu\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr ""
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr ""
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr ""
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+msgid "Please select a location by using the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr ""
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr ""
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "కిమీ"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
+#: ../panel-plugin/weather-http.c:239
 #, c-format
-msgid "Failed to open the socket (%s)."
+msgid "Failed to open the socket(%s)."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
+#: ../panel-plugin/weather-http.c:245
 #, c-format
-msgid "Failed to create a connection with the host (%s)."
+msgid "Failed to create a connection with the host(%s)."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
+#: ../panel-plugin/weather-http.c:282
 #, c-format
-msgid "Failed to send the request (%s)."
+msgid "Failed to send the request(%s)."
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
+#: ../panel-plugin/weather-http.c:330
 #, c-format
-msgid "Failed to receive data (%s)"
+msgid "Failed to receive data(%s)"
 msgstr ""
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr ""
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+msgid "Search location"
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+msgid "Enter a city name or address"
 msgstr ""
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
 "\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -367,19 +437,77 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr ""
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -387,318 +515,361 @@ msgstr ""
 "\n"
 "గాలి\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "వేగం"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "దిశ"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr ""
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr ""
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "రాత్రి: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "వివరాలు"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "వర్తించదు"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 5d2918d..40c5a21 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2010-05-03 22:58+0200\n"
 "Last-Translator: Osman Karagöz <osmank3 at gmail.com>\n"
 "Language-Team: <xfce-tr at googlegroups.com>\n"
@@ -19,329 +19,402 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "S"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "AB"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "RH"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "B"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "RY"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "N"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "Durgun"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "Durgun"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "N"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "HS"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Hava durumu bilgileri güncellenemedi."
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Url açılamıyor: %s "
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Hava durumu Güncelle"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Hava Tahmini"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Sıcaklık (S)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Atmosfer basıncı (AB)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Rüzgar Hızı (RH)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Rüzgar Yönü (RY)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "Rüzgar Yönü (RY)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Nem (N)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "Bulutlar"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "Kararsız Kapanıklık"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "Genellikle Bulutlu"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "Bulutlar"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>Düşen kar ve yağmur miktarı<b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Kurulmamış"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Lütfen proxy ayarlarını giriniz"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Lütfen proxy ayarlarını giriniz"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Keşfediliyor..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "Ölçü Birimi:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "İngiliz Ölçü Birimi"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "metrik"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Yer:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "Değiştir..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "Vekil sunucu:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "Vekil sunucu kullan:"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "Çevreden otomatik algıla"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "Görüntü"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "Etiketler arası geçişi haraketlendir"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/s"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "Sunucu adı alınamadı \"%s\". %d saniye içinde tekrar denenecek"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Soket açılamadı (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Sunucu ile bağlantı oluşturulamadı (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "İstek gönderilemedi (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Veri alınamadı (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 #, fuzzy
 msgid "Negative content length"
 msgstr "Negatif içerik uzunluğu"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "İçerik uzunluğu hesaplaması olanaksız."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Alınacak içerik yok."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Sonuçlar"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Aranıyor..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Hava durumu bölge kodu araması"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Şehir adı veya posta kodu giriniz"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -350,36 +423,36 @@ msgstr ""
 "%s için hava raporu:\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -389,8 +462,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -398,12 +529,12 @@ msgstr ""
 "\n"
 "Sıcaklık\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Sıcaklık"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -411,34 +542,34 @@ msgstr ""
 "\n"
 " Rüzgar \n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Hız"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Yön"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>Düşen kar ve yağmur miktarı<b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>Düşen kar ve yağmur miktarı<b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -447,303 +578,346 @@ msgstr ""
 "\n"
 " Atmosfer basıncı \n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Basınç"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Nem"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "Bulutlar"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Sis"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "Bulutlar"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "Bulutlar"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "Gece: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "%s için hava raporu:"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "Lütfen proxy ayarlarını giriniz"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "Detaylar"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "G"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "GGB"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "GB"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "BGB"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "B"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "BKB"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "KB"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "KKB"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "K"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "KKD"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "KD"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "DKD"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "D"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "DGD"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "GD"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "GGD"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Durgun"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Güneşli"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Açık"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "Genellikle Bulutlu"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "Parçalı Bulutlu"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Bulutlu"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "Sert Yağmur"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "Sert Yağmur"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "Güneşli"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "Açık"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "Sağanak Yağmur"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Yağmur"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "Yağmur / Gök gürültüsü"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Kar"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "Güneşli"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "Yoğun Kar"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "Yağmur / Gök gürültüsü"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "Sulusepken ve Kar"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "durgun"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "N/A"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Mevcut hava durumunu göster"
 
diff --git a/po/ug.po b/po/ug.po
index 25f09fe..cc5bbd1 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-07-26 16:16+0900\n"
 "Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
@@ -16,328 +16,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "CALM"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "CALM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "ھاۋارايى ئۇچۇرىنى يېڭىلىغىلى بولمىدى"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "تۆۋەندىكى  URL نى ئاچقىلى بولمىدى: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "ھازىرقى ھاۋارايى"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "ئالدىن مەلۇمات(_F)"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "تېمپېراتۇرا (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "ئاتموسفېرا بېسىمى (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "شامال تېزلىكى(WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "شامال يۆنىلىشى(WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "شامال يۆنىلىشى(WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "نەملىك(H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "بۇلۇت"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "ئۆزگىرىشچان بۇلۇتلۇق"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "بۇلۇتلۇق بەزىدە ئوچۇق"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "بۇلۇت"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>ئېھتىماللىقى</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "يوق قىل"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "ۋاكالەتچى مۇلازىمېتىرىنى تەڭشەڭ"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "ۋاكالەتچى مۇلازىمېتىرىنى تەڭشەڭ"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "ئىزدەۋاتىدۇ..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "ئۆلچەم بىرلىكى:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "ئىمپېرىيە بىرلىكى"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "مېتىر بىرلىكى"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "ئورنى:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "ئۆزگەرت…"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "ۋاكالەتچى مۇلازىمېتىر:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "ۋاكالەتچى مۇلازىمېتىر ئىشلەتسۇن"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "مۇھىتتىن ئاپتوماتىك تاپسۇن"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "كۆرسىتىدىغان ئەن"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "ئەن ئالماشتۇرۇپ جانلاندۇرۇم شەكلىدە كۆرسەت"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "ك م/ سائەت"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "كومپيۇتېر ئاتى %s نى ئوقۇيالمىدى. %d سېكۇنتتىن كېيىن قايتا سىناڭ."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "سوكېتنى ئېچىش مەغلۇپ بولدى (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "كومپيۇتېر بىلەن باغلىنىش مەغلۇپ بولدى (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "ئىلتىماس ئەۋەتىش مەغلۇپ بولدى (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "سانلىق-ئاساسلارنى قوبۇل قىلىش مەغلۇپ بولدى (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "مەزمۇن چوڭلۇقى مەنپىي سان"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "مەزمۇنلارنىڭ ئۇزۇنلۇقىنى تاپقىلى بولمىدى"
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "ھېچ نەرسە قوبۇل قىلىنمىدى."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "نەتىجىلەر"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "ئىزدەۋاتىدۇ…"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "ھاۋارايى رايون كودىنى ئىزدەيدۇ"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "شەھەر ئاتى ياكى پوچتا نومۇرىنى كىرگۈزۈڭ"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -346,36 +419,36 @@ msgstr ""
 "%s نىڭ ھاۋارايى مەلۇماتى.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -385,8 +458,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -394,12 +525,12 @@ msgstr ""
 "\n"
 "تېمپېراتۇرا\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "تېمپېراتۇرا"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -407,34 +538,34 @@ msgstr ""
 "\n"
 "شامال\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "سۈرئىتى"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "يۆنىلىشى"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>ئېھتىماللىقى</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>ئېھتىماللىقى</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -443,302 +574,345 @@ msgstr ""
 "\n"
 "ئاتموسفېرا بېسىمى\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "ئاتموسفېرا بېسىمى"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "نەملىكى"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "بۇلۇت"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "تۇمان"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "بۇلۇت"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "بۇلۇت"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "كەچ: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "ھاۋارايى مەلۇماتى: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "ۋاكالەتچى مۇلازىمېتىرىنى تەڭشەڭ"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "تەپسىلاتلار"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "CALM"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "ئوچۇق"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "ئوچۇق"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "بۇلۇتلۇق بەزىدە ئوچۇق"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "بەزى يەرلەر بۇلۇتلۇق"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "بۇلۇتلۇق"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "قاتتىق ئۆتكۈنچى يامغۇر"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "قاتتىق ئۆتكۈنچى يامغۇر"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "ئوچۇق"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "ئېچىلىۋاتىدۇ"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "ئۆتكۈنچى يامغۇر"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "يامغۇر"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "يامغۇر / گۈلدۈرماما"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "قار"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "ئوچۇق"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "قاتتىق قار"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "يامغۇر / گۈلدۈرماما"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "جىمجىت"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "يوق"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "ھازىرقى ھاۋارايى ئەھۋالىنى كۆرسىتىدۇ."
 
diff --git a/po/uk.po b/po/uk.po
index b4900a9..d6da560 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,326 +7,394 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-27 13:54+0300\n"
 "Last-Translator: Oleksandr Natalenko <pfactum at gmail.com>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 msgid "WB"
 msgstr "WB"
 
-#: ../panel-plugin/weather.c:139
-#: ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr "CL"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr "CM"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 msgid "CH"
 msgstr "CH"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr "C"
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr "R"
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "Немає даних"
 
-#: ../panel-plugin/weather.c:270
-#: ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "Не вдалось оновити дані про погоду"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "Не вдалося відкрити таке посилання: %s"
 
-#: ../panel-plugin/weather.c:827
-#: ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "Оновлення погоди"
 
-#. add refresh button to right click menu, for people who missed the middle
-#. mouse click feature
-#: ../panel-plugin/weather.c:970
-#: ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "Зараз даних немає."
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "_Прогноз"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "Температура (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "Атмосферний тиск (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "Швидкість вітру (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr "Швидкість вітру ­— шкала Бофорта (WB)"
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "Напрям вітру (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 msgid "Wind direction in degrees (WD)"
 msgstr "Напрям вітру у градусах (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "Вологість (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 msgid "Low clouds (CL)"
 msgstr "Хмари нижнього ярусу (CL)"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 msgid "Medium clouds (CM)"
 msgstr "Хмари середнього ярусу (CM)"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 msgid "High clouds (CH)"
 msgstr "Хмари високого ярусу (CH)"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 msgid "Cloudiness (C)"
 msgstr "Хмарність (C)"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr "Туман (F)"
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 msgid "Precipitations (R)"
 msgstr "Опади (R)"
 
-#: ../panel-plugin/weather-config.c:229
-#: ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "Не задано"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "Введіть параметри проксі"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "Укажіть розташування в налаштуваннях плагіна."
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "Триває визначення…"
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "Одиниці _виміру:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Імперські"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "Метричні"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "_Розташування:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "Змі_нити…"
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "_Проксі-сервер:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "_Використовувати проксі-сервер"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "_Автоматичне визначення із програмного середовища"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr "Кількість _днів для прогнозу:"
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "_Мітки для показу"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "_Додати"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "_Видалити"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "Перемістити в_гору"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "Перемістити в_низ"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "_Анімація переходів між мітками"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr "фути"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "метри"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "гПа"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "миль/год"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "км/год"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "\""
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "мм"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
-msgstr "Не вдалось отримати назву вузла %s. Повторну спробу буде виконано через %d с."
+msgstr ""
+"Не вдалось отримати назву вузла %s. Повторну спробу буде виконано через %d с."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "Не вдалося відкрити сокет (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "Не вдалось установити з’єднання з вузлом (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "Під час надсилання запиту сталася помилка (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "Не вдалось отримати дані (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "Виявлено від’ємну довжину вмісту"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "Не вдалося визначити довжину вмісту."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "Вміст не отримано."
 
-#: ../panel-plugin/weather-search.c:148
-#: ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "Результати"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "Триває пошук…"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "Пошук коду розташування для отримання погоди"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "Введіть назву міста або поштовий індекс"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
-msgstr "Без назви"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -335,23 +403,23 @@ msgstr ""
 "Звіт про погоду для: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr "Координати\n"
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr "Висота"
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr "Широта"
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr "Довгота"
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -359,7 +427,7 @@ msgstr ""
 "\n"
 "Час\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
@@ -368,7 +436,7 @@ msgstr ""
 "\tТемпература, вітер, дані про атмосферу та хмари станом на:\n"
 "\t%s\n"
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -383,8 +451,66 @@ msgstr ""
 "\tПочаток:\t%s\n"
 "\tЗакінчення:\t%s\n"
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -392,12 +518,12 @@ msgstr ""
 "\n"
 "Температура\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "Температура"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -405,21 +531,21 @@ msgstr ""
 "\n"
 "Вітер\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr "\t%s: %s (%s за шкалою Бофорта)\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "Швидкість"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "Напрямок"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 msgid ""
 "\n"
 "Precipitations\n"
@@ -427,12 +553,12 @@ msgstr ""
 "\n"
 "Опади\n"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 msgid "Precipitations amount"
 msgstr "Кількість опадів"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 msgid ""
 "\n"
 "Atmosphere\n"
@@ -440,16 +566,16 @@ msgstr ""
 "\n"
 "Атмосфера\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "Тиск"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "Вологість"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 msgid ""
 "\n"
 "Clouds\n"
@@ -457,28 +583,28 @@ msgstr ""
 "\n"
 "Хмари\n"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "Туман"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 msgid "Low clouds"
 msgstr "Хмари нижнього ярусу"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr "Хмари середнього ярусу"
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr "Хмари високого ярусу"
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 msgid "Cloudiness"
 msgstr "Хмари"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
@@ -486,246 +612,292 @@ msgstr ""
 "\n"
 "Дані надано Норвезьким інститутом метеорології\n"
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "Дякуючи met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr "Ранок"
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr "Обід"
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr "Вечір"
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 msgid "Night"
 msgstr "Ніч"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "Сьогодні"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "Завтра"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "Звіт про погоду для: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "Укажіть розташування в налаштуваннях плагіна."
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "Зараз даних немає."
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "_Докладно"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "Пд"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "ПдПдЗх"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "ПдЗх"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "ЗхПдЗх"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "Зх"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "ЗхПнЗх"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "ПнЗх"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "ПнПнЗх"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "Пн"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "ПнПнСх"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "ПнСх"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "СхПнСх"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "Сх"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "СхПдСх"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "ПдСх"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "ПдПдСх"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "Штиль"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "Сонячно"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "Ясно"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 msgid "Lightly cloudy"
 msgstr "Легка хмарність"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 msgid "Partly cloudy"
 msgstr "Часткова хмарність"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "Хмарно"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Sunny, rain showers"
 msgstr "Сонячно, зливи"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 msgid "Clear, rain showers"
 msgstr "Ясно, зливи"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr "Сонячно, зливи із грозами"
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr "Ясно, зливи з грозами"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr "Сонячно, мокрий сніг"
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr "Прояснення, мокрий сніг"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Sunny, snow"
 msgstr "Сонячно, сніг"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 msgid "Clear, snow"
 msgstr "Ясно, сніг"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 msgid "Rain showers"
 msgstr "Зливи"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "Дощ"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 msgid "Rain with thunder"
 msgstr "Дощ із грозою"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr "Мокрий сніг"
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "Сніг"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr "Сніг із грозою"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Sunny, Snow"
 msgstr "Сонячно, сніг"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 msgid "Clear, Snow"
 msgstr "Ясно, сніг"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr "Сонячно, мокрий сніг і гроза"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr "Ясно, мокрий сніг і гроза"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr "Сонячно, сніг і гроза"
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr "Ясно, сніг і гроза"
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 msgid "Rain showers with thunder"
 msgstr "Зливи із грозами"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 msgid "Sleet and thunder"
 msgstr "Мокрий сніг і грози"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "спокійно"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "Показати поточний стан погоди"
 
+#~ msgid "Untitled"
+#~ msgstr "Без назви"
+
 #~ msgid ""
 #~ "\tPoint data applies to:\n"
 #~ "\t%s\n"
diff --git a/po/ur.po b/po/ur.po
index 30269da..f0d1b0a 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-05-14 03:27+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -20,326 +20,399 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "موسمیاتی ڈیٹا تجدید نہیں ہوسکتا"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "یہ url نہیں کھولا جاسکتا: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "موسم تجدید"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 #, fuzzy
 msgid "_Forecast"
 msgstr "فورکاسٹ"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "درجہ حرارت (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "فضا کا دباؤ (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "ہوا کی رفتار (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "ہوا کا رخ (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "ہوا کا رخ (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "نمی (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "تغیر پذیر اندھیرا"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "زیادہ تر ابر آلود"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>گرنا</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "برائے مہربانی پراکسی ترتیبات ڈالیں"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "برائے مہربانی پراکسی ترتیبات ڈالیں"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "قیاس یونٹ:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "میٹرک"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "مقام کوڈ:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr ""
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "پراکسی سرور:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "پراکسی سرور استعمال کریں"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "ماحول سے خودکار دریافت"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "ڈسپلے کے لیے لیبل"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, fuzzy, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "ہوسٹ نیم \"%s\" حاصل کرنے میں ناکامی. %d سیکنڈ میں دوبارہ کوشش کریں."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "ساکٹ کھولنے میں ناکامی (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "ہوسٹ (%s) کے ساتھ اتصال قائم کرنے میں ناکامی."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "درخواست ارسال کرنے میں ناکامی (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "ڈیٹا وصول کرنے میں ناکامی (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "مواد کی طوالت دریافت نہیں کی جاسکتی."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "کوئی مواد موصول نہیں ہوا."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "نتائج"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 #, fuzzy
 msgid "Searching..."
 msgstr "صاف ہونے والا"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "موسم مقام کوڈ تلاش کریں"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "شہر کا نام یا زپ کوڈ لکھیں"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -348,36 +421,36 @@ msgstr ""
 "موسم رپورٹ برائے: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -387,8 +460,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -396,12 +527,12 @@ msgstr ""
 "\n"
 "درجہ حرارت\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "درجہ حرارت"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -409,34 +540,34 @@ msgstr ""
 "\n"
 "ہوا\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "رفتار"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "رخ"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>گرنا</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>گرنا</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -445,302 +576,345 @@ msgstr ""
 "\n"
 "فضائی دباؤ\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "دباؤ"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "رطوبت"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "دھند"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "رات: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "موسمیاتی رپورٹ برائے: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "برائے مہربانی پراکسی ترتیبات ڈالیں"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "روشن"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "صاف"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "زیادہ تر ابر آلود"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "جزوی ابر آلود"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "اب آلود"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "برفانی بوچھاڑ"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "برفانی بوچھاڑ"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "روشن"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "صاف ہونے والا"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "برفانی بوچھاڑ"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "بارش"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "بارش / بجلی"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "برف"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "روشن"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "بھاری برف باری"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "بارش / بجلی"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "ژالہ باری اور برفباری"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "سکون"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "غ/م"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "حالیہ موسم کی حالت ظاہر کریں"
 
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 30269da..f0d1b0a 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2009-05-14 03:27+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -20,326 +20,399 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "T"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "P"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "WS"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "W"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "WD"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 msgid "CL"
 msgstr ""
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 msgid "CM"
 msgstr ""
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "H"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "F"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "موسمیاتی ڈیٹا تجدید نہیں ہوسکتا"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "یہ url نہیں کھولا جاسکتا: %s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "موسم تجدید"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 #, fuzzy
 msgid "_Forecast"
 msgstr "فورکاسٹ"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "درجہ حرارت (T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "فضا کا دباؤ (P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "ہوا کی رفتار (WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "ہوا کا رخ (WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "ہوا کا رخ (WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "نمی (H)"
 
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "تغیر پذیر اندھیرا"
 
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "زیادہ تر ابر آلود"
 
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>گرنا</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "برائے مہربانی پراکسی ترتیبات ڈالیں"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "برائے مہربانی پراکسی ترتیبات ڈالیں"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "قیاس یونٹ:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "میٹرک"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "مقام کوڈ:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr ""
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "پراکسی سرور:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "پراکسی سرور استعمال کریں"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "ماحول سے خودکار دریافت"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "ڈسپلے کے لیے لیبل"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, fuzzy, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "ہوسٹ نیم \"%s\" حاصل کرنے میں ناکامی. %d سیکنڈ میں دوبارہ کوشش کریں."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "ساکٹ کھولنے میں ناکامی (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "ہوسٹ (%s) کے ساتھ اتصال قائم کرنے میں ناکامی."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "درخواست ارسال کرنے میں ناکامی (%s)."
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "ڈیٹا وصول کرنے میں ناکامی (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr ""
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "مواد کی طوالت دریافت نہیں کی جاسکتی."
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "کوئی مواد موصول نہیں ہوا."
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "نتائج"
 
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 #, fuzzy
 msgid "Searching..."
 msgstr "صاف ہونے والا"
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "موسم مقام کوڈ تلاش کریں"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "شہر کا نام یا زپ کوڈ لکھیں"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -348,36 +421,36 @@ msgstr ""
 "موسم رپورٹ برائے: %s.\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -387,8 +460,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -396,12 +527,12 @@ msgstr ""
 "\n"
 "درجہ حرارت\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "درجہ حرارت"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -409,34 +540,34 @@ msgstr ""
 "\n"
 "ہوا\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "رفتار"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "رخ"
 
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
 "Precipitations\n"
 msgstr "<b>گرنا</b>"
 
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>گرنا</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -445,302 +576,345 @@ msgstr ""
 "\n"
 "فضائی دباؤ\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "دباؤ"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "رطوبت"
 
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "دھند"
 
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "بادل"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "رات: %s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "موسمیاتی رپورٹ برائے: %s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "برائے مہربانی پراکسی ترتیبات ڈالیں"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "S"
 
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "SSW"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "SW"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "WSW"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "W"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "WNW"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "NW"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "NNW"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "N"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "NNE"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "NE"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "ENE"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "E"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "ESE"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "SE"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "SSE"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "روشن"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "صاف"
 
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "زیادہ تر ابر آلود"
 
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "جزوی ابر آلود"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "اب آلود"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "برفانی بوچھاڑ"
 
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "برفانی بوچھاڑ"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "روشن"
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "صاف ہونے والا"
 
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "برفانی بوچھاڑ"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "بارش"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "بارش / بجلی"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "برف"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "روشن"
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "بھاری برف باری"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "بارش / بجلی"
 
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "ژالہ باری اور برفباری"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "سکون"
 
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "غ/م"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "حالیہ موسم کی حالت ظاہر کریں"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 63db127..82ecf8b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2010-05-25 10:10+0800\n"
 "Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n-cn at xfce.org>\n"
@@ -20,112 +20,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "气温"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "气压"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "风速"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "西"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "风向"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "湿度"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "无风"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "无风"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "湿度"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "风寒"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr ""
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "未能更新天气数据"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "未能打开以下 url:%s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "天气资讯"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+msgid "Short-term forecast data unavailable."
+msgstr ""
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "天气预报(_F)"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "气温(T)"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "气压(P)"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "风速(WS)"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "风向(WD)"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "风向(WD)"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "湿度(H)"
 
 #  XXX
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "多云"
@@ -133,228 +184,250 @@ msgstr "多云"
 #  NOTE According to wrh.noaa.gov, "Variable Cloudiness" = "Variable Clouds"
 #  NOTE According to http://members.tripod.com/~MitchellBrown/almanac/weather_glossary.html, this means 20%–80% cloud cover
 #  XXX
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "云量不定"
 
 #  NOTE 6/8–7/8 cloud cover (NOAA)
 #  XXX
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "大部多云"
 
 #  XXX
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "多云"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
 #  NOTE cwb.gov.tw translation; Japanese equivalent is "降水確率" which seems to be also possible but much rarer
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>降水</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "复位"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "请输入代理服务器设置"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "请输入代理服务器设置"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "正在检测..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 #, fuzzy
 msgid "System of _Measurement:"
 msgstr "度量单位:"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "公制"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 #, fuzzy
 msgid "L_ocation:"
 msgstr "地区:"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 #, fuzzy
 msgid "Chan_ge..."
 msgstr "更改..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 #, fuzzy
 msgid "_Proxy server:"
 msgstr "代理服务器:"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 #, fuzzy
 msgid "Use proxy _server"
 msgstr "使用代理服务器"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 #, fuzzy
 msgid "Auto-detect from _environment"
 msgstr "从环境变量中自动检测"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 #, fuzzy
 msgid "_Labels to display"
 msgstr "要显示的标签"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 #, fuzzy
 msgid "Animate _transitions between labels"
 msgstr "在标签间动态切换"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
 #  NOTE "公里" is too long; SI symbols do not need translation
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 #, fuzzy
 msgid "m"
 msgstr "km"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr ""
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr ""
 
 #  NOTE "百帕斯卡" (even 百帕) too long; SI symbols do not need translation
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
 #  FIXME "哩/小時" is too long; but perhaps we could get by with just "哩"?
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
 #  NOTE "公里/小時" is too long; SI symbols do not need translation
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "in"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr ""
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "无法获取主机名 %s。在 %d 秒后重试。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "无法打开套接字(%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "无法创建与主机的连接(%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "无法发送请求(%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "无法接收数据(%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "负内容长度"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "未能检测内容长度。"
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "未接收到内容。"
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "结果"
 
 #  XXX
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "搜索天气位置代码"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "输入城市名称或邮政编码"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
 msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -363,36 +436,36 @@ msgstr ""
 "天气报告:%s。\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -402,8 +475,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -411,12 +542,12 @@ msgstr ""
 "\n"
 "气温\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "气温"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -424,22 +555,22 @@ msgstr ""
 "\n"
 "风\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "速度"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "方向"
 
 #  NOTE cwb.gov.tw translation; Japanese equivalent is "降水確率" which seems to be also possible but much rarer
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
@@ -447,13 +578,13 @@ msgid ""
 msgstr "<b>降水</b>"
 
 #  NOTE cwb.gov.tw translation; Japanese equivalent is "降水確率" which seems to be also possible but much rarer
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>降水</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -462,189 +593,232 @@ msgstr ""
 "\n"
 "气压\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "气压"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "湿度"
 
 #  XXX
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "多云"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "雾"
 
 #  XXX
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "多云"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
 #  XXX
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "多云"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "晚上:%s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "天气报告:%s"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 #, fuzzy
 msgid "Please set a location in the plugin settings."
 msgstr "请输入代理服务器设置"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 #, fuzzy
 msgid "_Details"
 msgstr "详情"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "南"
 
 #  NOTE SSW = S + SW = 西南 (SW) 偏 南 (S)
 #  NOTE 西南偏南, while more natural, would be too long; ditto below
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "西南南"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "西南"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "西南西"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "西"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "西北西"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "西北"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "西北北"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "北"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "东北北"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "东北"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "东北东"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "东"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "东南东"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "东南"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "东南南"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "无风"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "晴朗"
 
 #  NOTE hko.gov.hk translation; spotted in a weather report for Canada
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "无云"
 
 #  NOTE 6/8–7/8 cloud cover (NOAA)
 #  XXX
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "大部多云"
@@ -654,131 +828,131 @@ msgstr "大部多云"
 #  NOTE This might actually be normal; hko.gov.hk defines "晴" even less conservatively (anything less than 6/8 cloud cover)
 #  NOTE 3/8–5/8 cloud cover (NOAA), "Partly Cloudy" = "Partly Sunny" but can be at night
 #  NOTE The only problem with translating this as "天晴" is that it feels a bit weird to speak of "天晴" at night...
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "局部多云"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "多云"
 
 #  XXX what is the difference between this and just "Showers"?
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "大暴雨"
 
 #  XXX what is the difference between this and just "Showers"?
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "大暴雨"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "晴朗"
 
 #  XXX
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "转晴"
 
 #  XXX what is the difference between this and just "Showers"?
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "阵雨"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "雨"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "雨/雷"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "雪"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "晴朗"
 
 #  XXX
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "大雪"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "雨/雷"
 
 #  NOTE cwb.gov.tw translation
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "雨夹雪和雪"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "无风"
 
 #  NOTE N/A in this plugin seems to mean "not applicable" (as opposed to "not available")
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "不适用"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "显示目前天气情况"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 168218c..45ed0c2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-weather-plugin 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 20:29+0200\n"
+"POT-Creation-Date: 2012-08-03 02:00+0200\n"
 "PO-Revision-Date: 2012-07-19 21:49+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <xfce-i18n at xfce.org>\n"
@@ -43,112 +43,164 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/weather.c:127
+#. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
+#: ../panel-plugin/weather.c:137
 msgid "T"
 msgstr "溫度"
 
-#: ../panel-plugin/weather.c:130
+#: ../panel-plugin/weather.c:140
 msgid "P"
 msgstr "氣壓"
 
-#: ../panel-plugin/weather.c:133
+#: ../panel-plugin/weather.c:143
 msgid "WS"
 msgstr "風速"
 
-#: ../panel-plugin/weather.c:136
+#: ../panel-plugin/weather.c:146
 #, fuzzy
 msgid "WB"
 msgstr "西"
 
-#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
+#: ../panel-plugin/weather.c:149 ../panel-plugin/weather.c:152
 msgid "WD"
 msgstr "風向"
 
-#: ../panel-plugin/weather.c:145
+#: ../panel-plugin/weather.c:155
 msgid "H"
 msgstr "濕度"
 
-#: ../panel-plugin/weather.c:148
+#: ../panel-plugin/weather.c:158
 #, fuzzy
 msgid "CL"
 msgstr "無風"
 
-#: ../panel-plugin/weather.c:151
+#: ../panel-plugin/weather.c:161
 #, fuzzy
 msgid "CM"
 msgstr "無風"
 
-#: ../panel-plugin/weather.c:154
+#: ../panel-plugin/weather.c:164
 #, fuzzy
 msgid "CH"
 msgstr "濕度"
 
-#: ../panel-plugin/weather.c:157
+#: ../panel-plugin/weather.c:167
 msgid "C"
 msgstr ""
 
-#: ../panel-plugin/weather.c:160
+#: ../panel-plugin/weather.c:170
 msgid "F"
 msgstr "風凍"
 
-#: ../panel-plugin/weather.c:163
+#: ../panel-plugin/weather.c:173
 msgid "R"
 msgstr ""
 
-#: ../panel-plugin/weather.c:243
+#: ../panel-plugin/weather.c:241
 msgid "No Data"
 msgstr "無資料"
 
-#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869
+#: ../panel-plugin/weather.c:268 ../panel-plugin/weather.c:1007
 msgid "Cannot update weather data"
 msgstr "無法更新天氣資料"
 
-#: ../panel-plugin/weather.c:799
+#: ../panel-plugin/weather.c:830
 #, c-format
 msgid "Unable to open the following url: %s"
 msgstr "無法開啟下列網址:%s"
 
-#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625
-#: ../panel-plugin/weather.desktop.in.in.h:1
+#: ../panel-plugin/weather.c:856 ../panel-plugin/weather-summary.c:752
+#: ../panel-plugin/weather.desktop.in.h:1
 msgid "Weather Update"
 msgstr "天氣報告"
 
-#. add refresh button to right click menu, for people who missed the middle mouse click feature
-#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670
+#: ../panel-plugin/weather.c:899
+#, fuzzy
+msgid "Short-term forecast data unavailable."
+msgstr "目前尚未有資料。"
+
+#: ../panel-plugin/weather.c:914
+msgid "The sun never rises today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:916
+msgid "The sun never sets today."
+msgstr ""
+
+#: ../panel-plugin/weather.c:922
+#, c-format
+msgid "The sun rises at %s and sets at %s."
+msgstr ""
+
+#.
+#. * TRANSLATORS: Re-arrange and align at will, optionally using
+#. * abbreviations for labels if desired or necessary. Just take
+#. * into account the possible size constraints, the centered
+#. * vertical alignment of the icon - which unfortunately cannot
+#. * be changed easily - and try to make it compact and look
+#. * good!
+#.
+#: ../panel-plugin/weather.c:953
+#, c-format
+msgid ""
+"<b><span size=\"large\">%s</span></b> <span size=\"medium\">(%s)</span>\n"
+"<b><span size=\"large\">%s</span></b>\n"
+"<span size=\"smaller\">from %s to %s, with %s precipitations</span>\n"
+"\n"
+"<b>Temperature:</b> %s\t\t<span size=\"smaller\">(values at %s)</span>\n"
+"<b>Wind:</b> %s (%son the Beaufort scale) from %s(%s)\n"
+"<b>Pressure:</b> %s    <b>Humidity:</b> %s\n"
+"<b>Fog:</b> %s    <b>Cloudiness:</b> %s\n"
+"\n"
+"<span size=\"smaller\">%s</span>"
+msgstr ""
+
+#. add forecast window to right click menu, for people who missed
+#. the left mouse click feature
+#: ../panel-plugin/weather.c:1108 ../panel-plugin/weather-summary.c:797
 msgid "_Forecast"
 msgstr "天氣預報(_F)"
 
-#: ../panel-plugin/weather-config.c:38
+#.
+#. * TRANSLATORS: The abbreviations in parentheses will be shown in
+#. * the scrollbox together with the values. Keep them in sync with
+#. * those in make_label() in weather.c. Some of them may be
+#. * standardized internationally, like CL, CM, CH, and you might
+#. * read that up somewhere and decide whether you want to use them
+#. * or not. In general, though, you should just try to choose
+#. * letter(s) that make sense and don't use up too much space.
+#.
+#: ../panel-plugin/weather-config.c:48
 msgid "Temperature (T)"
 msgstr "溫度"
 
-#: ../panel-plugin/weather-config.c:39
+#: ../panel-plugin/weather-config.c:49
 msgid "Atmosphere pressure (P)"
 msgstr "氣壓"
 
-#: ../panel-plugin/weather-config.c:40
+#: ../panel-plugin/weather-config.c:50
 msgid "Wind speed (WS)"
 msgstr "風速"
 
-#: ../panel-plugin/weather-config.c:41
+#: ../panel-plugin/weather-config.c:51
 msgid "Wind speed - Beaufort scale (WB)"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:42
+#: ../panel-plugin/weather-config.c:52
 msgid "Wind direction (WD)"
 msgstr "風向"
 
-#: ../panel-plugin/weather-config.c:43
+#: ../panel-plugin/weather-config.c:53
 #, fuzzy
 msgid "Wind direction in degrees (WD)"
 msgstr "風向"
 
-#: ../panel-plugin/weather-config.c:44
+#: ../panel-plugin/weather-config.c:54
 msgid "Humidity (H)"
 msgstr "相對濕度(濕度)"
 
 #  XXX
-#: ../panel-plugin/weather-config.c:45
+#: ../panel-plugin/weather-config.c:55
 #, fuzzy
 msgid "Low clouds (CL)"
 msgstr "有雲"
@@ -156,219 +208,241 @@ msgstr "有雲"
 #  NOTE According to wrh.noaa.gov, "Variable Cloudiness" = "Variable Clouds"
 #  NOTE According to http://members.tripod.com/~MitchellBrown/almanac/weather_glossary.html, this means 20%–80% cloud cover
 #  XXX
-#: ../panel-plugin/weather-config.c:46
+#: ../panel-plugin/weather-config.c:56
 #, fuzzy
 msgid "Medium clouds (CM)"
 msgstr "雲量不定"
 
 #  NOTE 6/8–7/8 cloud cover (NOAA)
 #  XXX
-#: ../panel-plugin/weather-config.c:47
+#: ../panel-plugin/weather-config.c:57
 #, fuzzy
 msgid "High clouds (CH)"
 msgstr "大致多雲"
 
 #  XXX
-#: ../panel-plugin/weather-config.c:48
+#: ../panel-plugin/weather-config.c:58
 #, fuzzy
 msgid "Cloudiness (C)"
 msgstr "有雲"
 
-#: ../panel-plugin/weather-config.c:49
+#: ../panel-plugin/weather-config.c:59
 msgid "Fog (F)"
 msgstr ""
 
 #  NOTE cwb.gov.tw translation; Japanese equivalent is "降水確率" which seems to be also possible but much rarer
-#: ../panel-plugin/weather-config.c:50
+#: ../panel-plugin/weather-config.c:60
 #, fuzzy
 msgid "Precipitations (R)"
 msgstr "<b>降水機率</b>"
 
-#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383
-#: ../panel-plugin/weather-config.c:494
+#: ../panel-plugin/weather-config.c:240 ../panel-plugin/weather-config.c:418
+#: ../panel-plugin/weather-config.c:529
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../panel-plugin/weather-config.c:325
+#: ../panel-plugin/weather-config.c:333
 msgid "Please enter proxy settings"
 msgstr "請輸入代理伺服器選項"
 
-#: ../panel-plugin/weather-config.c:392
+#: ../panel-plugin/weather-config.c:384
+#, c-format
+msgid ""
+"Latitude: %s, Longitude: %s\n"
+"\n"
+"You may edit the location name to your liking.\n"
+"To choose another location, please use the \"Change\" button."
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:390
+#, fuzzy
+msgid "Please select a location by using the \"Change\" button."
+msgstr "請在插件設定中設定位置。"
+
+#: ../panel-plugin/weather-config.c:430
 msgid "Detecting..."
 msgstr "正在偵測..."
 
-#: ../panel-plugin/weather-config.c:450
+#. system of measurement
+#: ../panel-plugin/weather-config.c:490
 msgid "System of _Measurement:"
 msgstr "量度系統(_M):"
 
-#: ../panel-plugin/weather-config.c:455
+#: ../panel-plugin/weather-config.c:494
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panel-plugin/weather-config.c:457
+#: ../panel-plugin/weather-config.c:496
 msgid "Metric"
 msgstr "公制"
 
-#: ../panel-plugin/weather-config.c:470
+#. location
+#: ../panel-plugin/weather-config.c:508
 msgid "L_ocation:"
 msgstr "位置(_O):"
 
-#: ../panel-plugin/weather-config.c:508
+#: ../panel-plugin/weather-config.c:538
 msgid "Chan_ge..."
 msgstr "變更(_G)..."
 
-#. proxy
-#: ../panel-plugin/weather-config.c:521
+#. proxy settings
+#: ../panel-plugin/weather-config.c:550
 msgid "_Proxy server:"
 msgstr "代理伺服器(_P):"
 
-#: ../panel-plugin/weather-config.c:526
+#: ../panel-plugin/weather-config.c:555
 msgid "Use proxy _server"
 msgstr "使用代理伺服器(_S)"
 
-#: ../panel-plugin/weather-config.c:528
+#: ../panel-plugin/weather-config.c:557
 msgid "Auto-detect from _environment"
 msgstr "由環境變數自動偵測(_E)"
 
 #. number of days shown in forecast
-#: ../panel-plugin/weather-config.c:593
+#: ../panel-plugin/weather-config.c:610
 msgid "Number of _forecast days:"
 msgstr ""
 
-#: ../panel-plugin/weather-config.c:615
+#: ../panel-plugin/weather-config.c:632
 msgid "_Labels to display"
 msgstr "要顯示的標籤(_L)"
 
-#: ../panel-plugin/weather-config.c:619
+#. button "add"
+#: ../panel-plugin/weather-config.c:637
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../panel-plugin/weather-config.c:635
+#. button "remove"
+#: ../panel-plugin/weather-config.c:653
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../panel-plugin/weather-config.c:640
+#. button "move up"
+#: ../panel-plugin/weather-config.c:659
 msgid "Move _Up"
 msgstr "往上移(_U)"
 
-#: ../panel-plugin/weather-config.c:645
+#. button "move down"
+#: ../panel-plugin/weather-config.c:665
 msgid "Move _Down"
 msgstr "往下移(_D)"
 
-#: ../panel-plugin/weather-config.c:683
+#: ../panel-plugin/weather-config.c:700
 msgid "Animate _transitions between labels"
 msgstr "標籤之間的轉場以動畫呈現(_T)"
 
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "ft"
 msgstr ""
 
 #  NOTE "公里" is too long; SI symbols do not need translation
-#: ../panel-plugin/weather-data.c:131
+#: ../panel-plugin/weather-data.c:142
 msgid "m"
 msgstr "m"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°F"
 msgstr "°F"
 
-#: ../panel-plugin/weather-data.c:133
+#: ../panel-plugin/weather-data.c:144
 msgid "°C"
 msgstr "°C"
 
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "psi"
 msgstr "psi"
 
 #  NOTE "百帕斯卡" (even 百帕) too long; SI symbols do not need translation
-#: ../panel-plugin/weather-data.c:135
+#: ../panel-plugin/weather-data.c:146
 msgid "hPa"
 msgstr "hPa"
 
 #  FIXME "哩/小時" is too long; but perhaps we could get by with just "哩"?
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "mph"
 msgstr "mph"
 
 #  NOTE "公里/小時" is too long; SI symbols do not need translation
-#: ../panel-plugin/weather-data.c:137
+#: ../panel-plugin/weather-data.c:148
 msgid "km/h"
 msgstr "km/h"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "in"
 msgstr "吋"
 
-#: ../panel-plugin/weather-data.c:150
+#: ../panel-plugin/weather-data.c:161
 msgid "mm"
 msgstr "mm"
 
 #. display error
-#: ../panel-plugin/weather-http.c:203
+#: ../panel-plugin/weather-http.c:200
 #, c-format
 msgid "Failed to get the hostname %s. Retry in %d seconds."
 msgstr "無法取得主機名稱 %s。%d 秒內重試。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:244
-#, c-format
-msgid "Failed to open the socket (%s)."
+#: ../panel-plugin/weather-http.c:239
+#, fuzzy, c-format
+msgid "Failed to open the socket(%s)."
 msgstr "無法開啟 socket (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:255
-#, c-format
-msgid "Failed to create a connection with the host (%s)."
+#: ../panel-plugin/weather-http.c:245
+#, fuzzy, c-format
+msgid "Failed to create a connection with the host(%s)."
 msgstr "無法與主機 (%s) 建立連線。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:298
-#, c-format
-msgid "Failed to send the request (%s)."
+#: ../panel-plugin/weather-http.c:282
+#, fuzzy, c-format
+msgid "Failed to send the request(%s)."
 msgstr "無法送出請求 (%s)。"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:351
-#, c-format
-msgid "Failed to receive data (%s)"
+#: ../panel-plugin/weather-http.c:330
+#, fuzzy, c-format
+msgid "Failed to receive data(%s)"
 msgstr "無法接收資料 (%s)"
 
-#: ../panel-plugin/weather-http.c:377
+#: ../panel-plugin/weather-http.c:349
 msgid "Negative content length"
 msgstr "負內容長度"
 
-#. display warning
-#: ../panel-plugin/weather-http.c:413
+#: ../panel-plugin/weather-http.c:375
 msgid "Unable to detect the content length."
 msgstr "無法偵測內容長度。"
 
-#: ../panel-plugin/weather-http.c:421
+#: ../panel-plugin/weather-http.c:379
 msgid "No content received."
 msgstr "未接收到內容。"
 
-#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280
+#: ../panel-plugin/weather-search.c:143 ../panel-plugin/weather-search.c:275
 msgid "Results"
 msgstr "搜尋結果"
 
 #  XXX
-#: ../panel-plugin/weather-search.c:189
+#: ../panel-plugin/weather-search.c:183
 msgid "Searching..."
 msgstr "正在搜尋..."
 
-#: ../panel-plugin/weather-search.c:229
-msgid "Search weather location code"
+#: ../panel-plugin/weather-search.c:220
+#, fuzzy
+msgid "Search location"
 msgstr "搜尋天氣地區代碼"
 
-#: ../panel-plugin/weather-search.c:253
-msgid "Enter a city name or zip code"
+#: ../panel-plugin/weather-search.c:245
+#, fuzzy
+msgid "Enter a city name or address"
 msgstr "請輸入城市名稱或郵遞區號"
 
-#: ../panel-plugin/weather-search.c:468
-msgid "Untitled"
-msgstr "無標題"
+#.
+#. * TRANSLATORS: Latitude and longitude are known from the
+#. * search results, but not the location name. The user shall
+#. * give the place a name.
+#.
+#: ../panel-plugin/weather-search.c:420
+msgid "Unnamed place"
+msgstr ""
 
 #. head
-#: ../panel-plugin/weather-summary.c:274
+#: ../panel-plugin/weather-summary.c:312
 #, c-format
 msgid ""
 "Weather report for: %s.\n"
@@ -377,23 +451,23 @@ msgstr ""
 "%s 天氣報告:\n"
 "\n"
 
-#: ../panel-plugin/weather-summary.c:279
+#: ../panel-plugin/weather-summary.c:318
 msgid "Coordinates\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:280
+#: ../panel-plugin/weather-summary.c:319
 msgid "Altitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:281
+#: ../panel-plugin/weather-summary.c:320
 msgid "Latitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:282
+#: ../panel-plugin/weather-summary.c:321
 msgid "Longitude"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:284
+#: ../panel-plugin/weather-summary.c:323
 msgid ""
 "\n"
 "Time\n"
@@ -401,14 +475,14 @@ msgstr ""
 "\n"
 "時間\n"
 
-#: ../panel-plugin/weather-summary.c:287
+#: ../panel-plugin/weather-summary.c:327
 #, c-format
 msgid ""
 "\tTemperature, wind, atmosphere and cloud data apply to:\n"
 "\t%s\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:294
+#: ../panel-plugin/weather-summary.c:336
 #, c-format
 msgid ""
 "\n"
@@ -418,8 +492,66 @@ msgid ""
 "\tEnd:\t%s\n"
 msgstr ""
 
-#. Temperature
-#: ../panel-plugin/weather-summary.c:300
+#. sun and moon
+#: ../panel-plugin/weather-summary.c:345
+msgid ""
+"\n"
+"Astrological Data\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:348
+msgid "\tSunrise:\t\tThe sun never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:351
+msgid "\tSunset:\t\tThe sun never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:356
+#, c-format
+msgid "\tSunrise:\t\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:361
+#, c-format
+msgid ""
+"\tSunset:\t\t%s\n"
+"\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:366
+#, c-format
+msgid "\tMoon phase:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:370
+msgid "\tMoon phase:\tUnknown\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:374
+msgid "\tMoonrise:\tThe moon never rises today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:377
+msgid "\tMoonset:\tThe moon never sets today.\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:382
+#, c-format
+msgid "\tMoonrise:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:387
+#, c-format
+msgid "\tMoonset:\t%s\n"
+msgstr ""
+
+#: ../panel-plugin/weather-summary.c:391
+msgid "\tData not available, will use sane default values for night and day.\n"
+msgstr ""
+
+#. temperature
+#: ../panel-plugin/weather-summary.c:397
 msgid ""
 "\n"
 "Temperature\n"
@@ -427,12 +559,12 @@ msgstr ""
 "\n"
 "溫度\n"
 
-#: ../panel-plugin/weather-summary.c:301
+#: ../panel-plugin/weather-summary.c:398
 msgid "Temperature"
 msgstr "溫度"
 
-#. Wind
-#: ../panel-plugin/weather-summary.c:304
+#. wind
+#: ../panel-plugin/weather-summary.c:401
 msgid ""
 "\n"
 "Wind\n"
@@ -440,22 +572,22 @@ msgstr ""
 "\n"
 "風勢\n"
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:406
 #, c-format
 msgid "\t%s: %s (%s on the Beaufort scale)\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:309
+#: ../panel-plugin/weather-summary.c:407
 msgid "Speed"
 msgstr "風速"
 
-#: ../panel-plugin/weather-summary.c:318
+#: ../panel-plugin/weather-summary.c:416
 msgid "Direction"
 msgstr "風向"
 
 #  NOTE cwb.gov.tw translation; Japanese equivalent is "降水確率" which seems to be also possible but much rarer
-#. Precipitation
-#: ../panel-plugin/weather-summary.c:326
+#. precipitation
+#: ../panel-plugin/weather-summary.c:424
 #, fuzzy
 msgid ""
 "\n"
@@ -463,13 +595,13 @@ msgid ""
 msgstr "<b>降水機率</b>"
 
 #  NOTE cwb.gov.tw translation; Japanese equivalent is "降水確率" which seems to be also possible but much rarer
-#: ../panel-plugin/weather-summary.c:327
+#: ../panel-plugin/weather-summary.c:425
 #, fuzzy
 msgid "Precipitations amount"
 msgstr "<b>降水機率</b>"
 
-#. Atmosphere
-#: ../panel-plugin/weather-summary.c:330
+#. atmosphere
+#: ../panel-plugin/weather-summary.c:428
 #, fuzzy
 msgid ""
 "\n"
@@ -478,187 +610,230 @@ msgstr ""
 "\n"
 "大氣壓力\n"
 
-#: ../panel-plugin/weather-summary.c:331
+#: ../panel-plugin/weather-summary.c:429
 msgid "Pressure"
 msgstr "氣壓"
 
-#: ../panel-plugin/weather-summary.c:332
+#: ../panel-plugin/weather-summary.c:430
 msgid "Humidity"
 msgstr "相對濕度"
 
 #  XXX
-#. Clouds
-#: ../panel-plugin/weather-summary.c:335
+#. clouds
+#: ../panel-plugin/weather-summary.c:433
 #, fuzzy
 msgid ""
 "\n"
 "Clouds\n"
 msgstr "有雲"
 
-#: ../panel-plugin/weather-summary.c:336
-#: ../panel-plugin/weather-translate.c:110
+#: ../panel-plugin/weather-summary.c:434
+#: ../panel-plugin/weather-translate.c:132
 msgid "Fog"
 msgstr "有霧"
 
 #  XXX
-#: ../panel-plugin/weather-summary.c:337
+#: ../panel-plugin/weather-summary.c:435
 #, fuzzy
 msgid "Low clouds"
 msgstr "有雲"
 
-#: ../panel-plugin/weather-summary.c:338
+#: ../panel-plugin/weather-summary.c:436
 msgid "Medium clouds"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:339
+#: ../panel-plugin/weather-summary.c:437
 msgid "High clouds"
 msgstr ""
 
 #  XXX
-#: ../panel-plugin/weather-summary.c:340
+#: ../panel-plugin/weather-summary.c:438
 #, fuzzy
 msgid "Cloudiness"
 msgstr "有雲"
 
-#: ../panel-plugin/weather-summary.c:342
+#: ../panel-plugin/weather-summary.c:440
 msgid ""
 "\n"
 "Data from The Norwegian Meteorological Institute\n"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:345
+#: ../panel-plugin/weather-summary.c:443
 msgid "Thanks to met.no"
 msgstr "感謝 met.no"
 
-#: ../panel-plugin/weather-summary.c:448
+#: ../panel-plugin/weather-summary.c:556
 msgid "Morning"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:451
+#: ../panel-plugin/weather-summary.c:559
 msgid "Afternoon"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:454
+#: ../panel-plugin/weather-summary.c:562
 msgid "Evening"
 msgstr ""
 
-#: ../panel-plugin/weather-summary.c:457
+#: ../panel-plugin/weather-summary.c:565
 #, fuzzy
 msgid "Night"
 msgstr "晚間:%s"
 
-#: ../panel-plugin/weather-summary.c:466
+#: ../panel-plugin/weather-summary.c:574
 #, c-format
 msgid "Today"
 msgstr "今日"
 
-#: ../panel-plugin/weather-summary.c:468
+#: ../panel-plugin/weather-summary.c:576
 #, c-format
 msgid "Tomorrow"
 msgstr "明日"
 
-#: ../panel-plugin/weather-summary.c:633
+#: ../panel-plugin/weather-summary.c:760
 #, c-format
 msgid "Weather report for: %s"
 msgstr "%s 天氣報告"
 
-#: ../panel-plugin/weather-summary.c:656
+#: ../panel-plugin/weather-summary.c:783
 msgid "Please set a location in the plugin settings."
 msgstr "請在插件設定中設定位置。"
 
-#: ../panel-plugin/weather-summary.c:658
+#: ../panel-plugin/weather-summary.c:785
 msgid "Currently no data available."
 msgstr "目前尚未有資料。"
 
-#: ../panel-plugin/weather-summary.c:673
+#: ../panel-plugin/weather-summary.c:800
 msgid "_Details"
 msgstr "詳細資料(_D)"
 
-#: ../panel-plugin/weather-translate.c:34
+#. TRANSLATORS: Wind directions. It's where the wind comes _from_.
+#: ../panel-plugin/weather-translate.c:35
 msgid "S"
 msgstr "南"
 
 #  NOTE SSW = S + SW = 西南 (SW) 偏 南 (S)
 #  NOTE 西南偏南, while more natural, would be too long; ditto below
-#: ../panel-plugin/weather-translate.c:35
+#: ../panel-plugin/weather-translate.c:36
 msgid "SSW"
 msgstr "西南南"
 
-#: ../panel-plugin/weather-translate.c:36
+#: ../panel-plugin/weather-translate.c:37
 msgid "SW"
 msgstr "西南"
 
-#: ../panel-plugin/weather-translate.c:37
+#: ../panel-plugin/weather-translate.c:38
 msgid "WSW"
 msgstr "西南西"
 
-#: ../panel-plugin/weather-translate.c:38
+#: ../panel-plugin/weather-translate.c:39
 msgid "W"
 msgstr "西"
 
-#: ../panel-plugin/weather-translate.c:39
+#: ../panel-plugin/weather-translate.c:40
 msgid "WNW"
 msgstr "西北西"
 
-#: ../panel-plugin/weather-translate.c:40
+#: ../panel-plugin/weather-translate.c:41
 msgid "NW"
 msgstr "西北"
 
-#: ../panel-plugin/weather-translate.c:41
+#: ../panel-plugin/weather-translate.c:42
 msgid "NNW"
 msgstr "西北北"
 
-#: ../panel-plugin/weather-translate.c:42
+#: ../panel-plugin/weather-translate.c:43
 msgid "N"
 msgstr "北"
 
-#: ../panel-plugin/weather-translate.c:43
+#: ../panel-plugin/weather-translate.c:44
 msgid "NNE"
 msgstr "東北北"
 
-#: ../panel-plugin/weather-translate.c:44
+#: ../panel-plugin/weather-translate.c:45
 msgid "NE"
 msgstr "東北"
 
-#: ../panel-plugin/weather-translate.c:45
+#: ../panel-plugin/weather-translate.c:46
 msgid "ENE"
 msgstr "東北東"
 
-#: ../panel-plugin/weather-translate.c:46
+#: ../panel-plugin/weather-translate.c:47
 msgid "E"
 msgstr "東"
 
-#: ../panel-plugin/weather-translate.c:47
+#: ../panel-plugin/weather-translate.c:48
 msgid "ESE"
 msgstr "東南東"
 
-#: ../panel-plugin/weather-translate.c:48
+#: ../panel-plugin/weather-translate.c:49
 msgid "SE"
 msgstr "東南"
 
-#: ../panel-plugin/weather-translate.c:49
+#: ../panel-plugin/weather-translate.c:50
 msgid "SSE"
 msgstr "東南南"
 
-#: ../panel-plugin/weather-translate.c:50
+#: ../panel-plugin/weather-translate.c:51
 msgid "CALM"
 msgstr "無風"
 
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#. TRANSLATORS: Moon phases
+#: ../panel-plugin/weather-translate.c:57
+msgid "New moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:58
+msgid "Waxing crescent"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:59
+msgid "First quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:60
+msgid "Waxing gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:61
+msgid "Full moon"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:62
+msgid "Waning gibbous"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
+msgid "Third quarter"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:64
+msgid "Waning crescent"
+msgstr ""
+
+#.
+#. * TRANSLATORS: Some of these terms seem to contradict
+#. * themselves. If I'm not mistaken, this is because the forecasts
+#. * are for certain time periods which may be 1, 3 or 6 hours, and
+#. * during those periods the weather can alternate between several
+#. * states. For more information, you might want to read
+#. * http://api.met.no/weatherapi/locationforecastlts/1.1/documentation,
+#. * but unfortunately it is not very revealing either.
+#.
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Sunny"
 msgstr "陽光普照"
 
 #  NOTE hko.gov.hk translation; spotted in a weather report for Canada
-#: ../panel-plugin/weather-translate.c:95
-#: ../panel-plugin/weather-translate.c:111
+#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:133
 msgid "Clear"
 msgstr "明朗"
 
 #  NOTE 6/8–7/8 cloud cover (NOAA)
 #  XXX
-#: ../panel-plugin/weather-translate.c:96
-#: ../panel-plugin/weather-translate.c:112
+#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:134
 #, fuzzy
 msgid "Lightly cloudy"
 msgstr "大致多雲"
@@ -668,134 +843,137 @@ msgstr "大致多雲"
 #  NOTE This might actually be normal; hko.gov.hk defines "晴" even less conservatively (anything less than 6/8 cloud cover)
 #  NOTE 3/8–5/8 cloud cover (NOAA), "Partly Cloudy" = "Partly Sunny" but can be at night
 #  NOTE The only problem with translating this as "天晴" is that it feels a bit weird to speak of "天晴" at night...
-#: ../panel-plugin/weather-translate.c:97
+#: ../panel-plugin/weather-translate.c:119
 #, fuzzy
 msgid "Partly cloudy"
 msgstr "疏雲"
 
-#: ../panel-plugin/weather-translate.c:98
+#: ../panel-plugin/weather-translate.c:120
 msgid "Cloudy"
 msgstr "多雲"
 
 #  XXX what is the difference between this and just "Showers"?
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Sunny, rain showers"
 msgstr "大陣雨"
 
 #  XXX what is the difference between this and just "Showers"?
-#: ../panel-plugin/weather-translate.c:99
-#: ../panel-plugin/weather-translate.c:113
+#: ../panel-plugin/weather-translate.c:121
+#: ../panel-plugin/weather-translate.c:135
 #, fuzzy
 msgid "Clear, rain showers"
 msgstr "大陣雨"
 
-#: ../panel-plugin/weather-translate.c:100
+#: ../panel-plugin/weather-translate.c:122
 msgid "Sunny, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:101
+#: ../panel-plugin/weather-translate.c:123
 msgid "Clear, rain showers with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Sunny, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:102
+#: ../panel-plugin/weather-translate.c:124
 msgid "Clear, sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Sunny, snow"
 msgstr "陽光普照"
 
 #  XXX
-#: ../panel-plugin/weather-translate.c:103
+#: ../panel-plugin/weather-translate.c:125
 #, fuzzy
 msgid "Clear, snow"
 msgstr "轉趨明朗"
 
 #  XXX what is the difference between this and just "Showers"?
-#: ../panel-plugin/weather-translate.c:104
+#: ../panel-plugin/weather-translate.c:126
 #, fuzzy
 msgid "Rain showers"
 msgstr "陣雨"
 
-#: ../panel-plugin/weather-translate.c:105
+#: ../panel-plugin/weather-translate.c:127
 msgid "Rain"
 msgstr "雨"
 
-#: ../panel-plugin/weather-translate.c:106
+#: ../panel-plugin/weather-translate.c:128
 #, fuzzy
 msgid "Rain with thunder"
 msgstr "雨 / 雷"
 
-#: ../panel-plugin/weather-translate.c:107
+#: ../panel-plugin/weather-translate.c:129
 msgid "Sleet"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:108
+#: ../panel-plugin/weather-translate.c:130
 msgid "Snow"
 msgstr "雪"
 
-#: ../panel-plugin/weather-translate.c:109
+#: ../panel-plugin/weather-translate.c:131
 msgid "Snow with thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Sunny, Snow"
 msgstr "陽光普照"
 
 #  XXX
-#: ../panel-plugin/weather-translate.c:114
+#: ../panel-plugin/weather-translate.c:136
 #, fuzzy
 msgid "Clear, Snow"
 msgstr "大雪"
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Sunny, Sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:115
+#: ../panel-plugin/weather-translate.c:137
 msgid "Clear, sleet and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Sunny, Snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:116
+#: ../panel-plugin/weather-translate.c:138
 msgid "Clear, snow and thunder"
 msgstr ""
 
-#: ../panel-plugin/weather-translate.c:117
+#: ../panel-plugin/weather-translate.c:139
 #, fuzzy
 msgid "Rain showers with thunder"
 msgstr "雨 / 雷"
 
 #  NOTE cwb.gov.tw translation
-#: ../panel-plugin/weather-translate.c:118
+#: ../panel-plugin/weather-translate.c:140
 #, fuzzy
 msgid "Sleet and thunder"
 msgstr "霰和雪"
 
-#: ../panel-plugin/weather-translate.c:215
+#: ../panel-plugin/weather-translate.c:246
 msgid "calm"
 msgstr "無風"
 
 #  NOTE N/A in this plugin seems to mean "not applicable" (as opposed to "not available")
-#: ../panel-plugin/weather-translate.c:217
+#: ../panel-plugin/weather-translate.c:248
 msgid "N/A"
 msgstr "不適用"
 
-#: ../panel-plugin/weather.desktop.in.in.h:2
+#: ../panel-plugin/weather.desktop.in.h:2
 msgid "Show current weather conditions"
 msgstr "顯示目前天氣狀況"
 
+#~ msgid "Untitled"
+#~ msgstr "無標題"
+
 #  NOTE According to wrh.noaa.gov, "Variable Cloudiness" = "Variable Clouds"
 #  NOTE According to http://members.tripod.com/~MitchellBrown/almanac/weather_glossary.html, this means 20%–80% cloud cover
 #  XXX


More information about the Xfce4-commits mailing list