diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/autogen.sh gnome-shell-extension-weather-0~20151114.git609/autogen.sh
--- gnome-shell-extension-weather-0~20140924.git7e28508/autogen.sh	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/autogen.sh	2015-11-17 15:10:32.000000000 +0000
@@ -1,5 +1,32 @@
 #!/bin/bash
 # Run this to generate all the initial makefiles, etc.
+#
+#
+#  Weather extension for GNOME Shell
+#  - generate Makefiles
+#
+# Copyright (C) 2012 - 2015
+#     Jens Lody <jens@jenslody.de>,
+#
+# This file is part of gnome-shell-extension-openweather.
+#
+# gnome-shell-extension-openweather is free software: you can
+# redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# gnome-shell-extension-openweather is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with gnome-shell-extension-openweather.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/configure.ac gnome-shell-extension-weather-0~20151114.git609/configure.ac
--- gnome-shell-extension-weather-0~20140924.git7e28508/configure.ac	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/configure.ac	2015-11-17 15:10:32.000000000 +0000
@@ -21,6 +21,8 @@
 
 GLIB_GSETTINGS
 
+AC_ARG_VAR(GIT_VERSION, git-version to be placed in metadata.json, will be overwritten when uploaded to gnome.org (default not set))
+
 AC_ARG_WITH(desktop-dir, [  --with-desktop-dir=PATH where to install desktop files (default=PREFIX/share)])
 
 if test "x$with_desktop_dir" != x; then
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/data/Makefile.am gnome-shell-extension-weather-0~20151114.git609/data/Makefile.am
--- gnome-shell-extension-weather-0~20140924.git7e28508/data/Makefile.am	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/data/Makefile.am	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 
 extensiondir = $(topextensiondir)/$(uuid)
 
-dist_extension_DATA = stylesheet.css weather-settings.ui
+dist_extension_DATA = OpenWeather.png stylesheet.css weather-settings.ui
 
 nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
 
@@ -16,7 +16,8 @@
 metadata.json: metadata.json.in $(top_builddir)/config.status
 	$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
 	    -e "s|[@]uuid@|$(uuid)|" \
-	    -e "s|[@]url@|$(extensionurl)|" $< > $@
+	    -e "s|[@]url@|$(extensionurl)|" \
+	    -e "s|[@]version@|$(GIT_VERSION)|" $< > $@
 
 CLEANFILES = metadata.json
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/data/metadata.json.in gnome-shell-extension-weather-0~20151114.git609/data/metadata.json.in
--- gnome-shell-extension-weather-0~20140924.git7e28508/data/metadata.json.in	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/data/metadata.json.in	2015-11-17 15:10:32.000000000 +0000
@@ -1,8 +1,9 @@
 {
 "uuid": "@uuid@",
 "name": "OpenWeather",
-"description": "Weather extension to display weather information from http://openweathermap.org/ for many cities in GNOME Shell",
-"shell-version": [ "3.6", "3.8", "3.10", "3.12", "3.14" ],
+"description": "Weather extension to display weather information from https://openweathermap.org/ or https://forecast.io for almost all locations in the world.\nFor openweathermap.org, you can either use the extensions default-key or register at http://openweathermap.org/appid and set the appropriate switch in the preferences dialog to \"off\".\nFor forecast.io you have to register at https://developer.forecast.io/register and get a personal API-key.\n\nSince version 29 this extensions uses coordinates to store the locations and makes the names editable to support multiple weather-providers!\nIf you update from versions prior to 29 to 29 or greater (with forecast.io - support) you have to recreate your locations.",
+"shell-version": [ "3.12", "3.14", "3.16", "3.18", "3.19.1" ],
 "localedir": "@LOCALEDIR@",
-"url": "@url@"
+"url": "@url@",
+"version": "@version@"
 }
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/data/org.gnome.shell.extensions.openweather.gschema.xml.in gnome-shell-extension-weather-0~20151114.git609/data/org.gnome.shell.extensions.openweather.gschema.xml.in
--- gnome-shell-extension-weather-0~20140924.git7e28508/data/org.gnome.shell.extensions.openweather.gschema.xml.in	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/data/org.gnome.shell.extensions.openweather.gschema.xml.in	2015-11-17 15:10:32.000000000 +0000
@@ -1,4 +1,13 @@
 <schemalist gettext-domain="gnome-shell-extension-openweather">
+  <enum id="org.gnome.shell.extensions.openweather.weather-provider">
+    <value nick="openweathermap" value="0" />
+    <value nick="forecast.io" value="1" />
+  </enum>
+  <enum id="org.gnome.shell.extensions.openweather.geolocation-provider">
+    <value nick="openstreetmaps" value="0" />
+    <value nick="geocode" value="1" />
+    <value nick="mapquest" value="2" />
+  </enum>
   <enum id="org.gnome.shell.extensions.openweather.unit">
     <value nick="celsius" value="0" />
     <value nick="fahrenheit" value="1" />
@@ -19,6 +28,7 @@
     <value nick="at" value="6" />
     <value nick="Torr" value="7" />
     <value nick="psi" value="8" />
+    <value nick="mmHg" value="9" />
   </enum>
   <enum id="org.gnome.shell.extensions.openweather.wind-speed-unit">
     <value nick="kph" value="0" />
@@ -38,6 +48,14 @@
     <value nick="left" value="2"  />
   </enum>
   <schema id="org.gnome.shell.extensions.openweather" path="/org/gnome/shell/extensions/openweather/">
+    <key name="weather-provider" enum="org.gnome.shell.extensions.openweather.weather-provider">
+      <default>'openweathermap'</default>
+      <_summary>Weather Provider</_summary>
+    </key>
+    <key name="geolocation-provider" enum="org.gnome.shell.extensions.openweather.geolocation-provider">
+      <default>'openstreetmaps'</default>
+      <_summary>Geolocation Provider</_summary>
+    </key>
     <key name="unit" enum="org.gnome.shell.extensions.openweather.unit">
       <default>'fahrenheit'</default>
       <_summary>Temperature Unit</_summary>
@@ -57,7 +75,7 @@
       <_description>Choose whether to display wind direction through arrows or letters.</_description>
     </key>
     <key name="city" type="s">
-      <default>'2516479>Eivissa (CA)'</default>
+      <default>'-8.5211767,179.1976747>Vaiaku, Tuvalu>-1'</default>
       <_summary>City to be displayed</_summary>
     </key>
     <key name="actual-city" type="i">
@@ -84,6 +102,10 @@
       <default>false</default>
       <_summary>Conditions in Panel</_summary>
     </key>
+    <key name="show-comment-in-forecast" type="b">
+      <default>true</default>
+      <_summary>Conditions in Forecast</_summary>
+    </key>
     <key name="position-in-panel" enum="org.gnome.shell.extensions.openweather.position">
       <default>'center'</default>
       <_summary>Position in Panel</_summary>
@@ -112,5 +134,17 @@
       <default>''</default>
       <_summary>Your personal API key from openweathermap.org</_summary>
     </key>
+    <key name="use-default-owm-key" type="b">
+      <default>true</default>
+      <_summary>Use the extensions default API key from openweathermap.org</_summary>
+    </key>
+    <key name="appid-fc" type="s">
+      <default>''</default>
+      <_summary>Your personal API key from forecast.io</_summary>
+    </key>
+    <key name="geolocation-appid-mapquest" type="s">
+      <default>''</default>
+      <_summary>Your personal AppKey from developer.geocode.farm</_summary>
+    </key>
   </schema>
 </schemalist>
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/data/stylesheet.css gnome-shell-extension-weather-0~20151114.git609/data/stylesheet.css
--- gnome-shell-extension-weather-0~20140924.git7e28508/data/stylesheet.css	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/data/stylesheet.css	2015-11-17 15:10:32.000000000 +0000
@@ -1,21 +1,3 @@
-.openweather-button {
-border-radius: 32px;
-padding: 13px;
-}
-
-.openweather-button:hover{
-border: none;
-padding: 14px;
-}
-
-.openweather-button > StIcon {
-icon-size: 16px;
-}
-
-.openweather-button > StLabel {
-padding:6px;
-}
-
 .openweather-menu-button-container{
 padding: 0px;
 }
@@ -31,12 +13,25 @@
 .openweather-button-box-38:rtl{
 padding-right: 24px;
 }
+
 .openweather-provider {
 border-width: 0px;
 border-radius:5px;
 padding:5px;
 }
 
+.openweather-current-summarybox,
+.openweather-forecast-icon,
+.openweather-current-databox-captions,
+.openweather-current-databox-values,
+.openweather-current-icon,
+.openweather-forecast-summary,
+.openweather-forecast-temperature{
+border-radius: 0px;
+padding: 0px;
+border: 0px;
+}
+
 .openweather-current-summarybox {
 padding-top:5px;
 }
@@ -68,7 +63,7 @@
 .openweather-current-databox-captions {
 text-align: right;
 padding-right: 5px;
-color: #999999;
+spacing: 0;
 }
 
 .openweather-forecast-icon {
@@ -79,19 +74,17 @@
 -st-hfade-offset: 60px;
 }
 
-.openweather-forecast-box {
-}
-
 .openweather-forecast-databox {
 min-width: 140px;
 }
 
 .openweather-forecast-day {
-color: #999999;
 font-size: 90%;
+spacing: 0;
 }
 
 .openweather-forecast-iconbox {
+vertical-align: top;
 }
 
 .openweather-sunrise-icon {
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/data/weather-settings.ui gnome-shell-extension-weather-0~20151114.git609/data/weather-settings.ui
--- gnome-shell-extension-weather-0~20140924.git7e28508/data/weather-settings.ui	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/data/weather-settings.ui	2015-11-17 15:10:32.000000000 +0000
@@ -1,117 +1,1328 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkListStore" id="liststore">
+<!-- Generated with glade 3.18.3 -->
+<interface domain="gnome-shell-extension-openweather">
+  <requires lib="gtk+" version="3.12"/>
+  <object class="GtkAdjustment" id="current-refresh-adjustment">
+    <property name="lower">10</property>
+    <property name="upper">1440</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkWindow" id="edit-widget">
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="hide_titlebar_when_maximized">True</property>
+    <property name="type_hint">dialog</property>
+    <child>
+      <object class="GtkBox" id="edit-box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="hexpand">True</property>
+            <property name="label" translatable="yes">Edit name</property>
+            <property name="ellipsize">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="edit-name">
+            <property name="width_request">350</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="secondary_icon_name">edit-clear-symbolic</property>
+            <property name="primary_icon_activatable">False</property>
+            <property name="primary_icon_sensitive">False</property>
+            <property name="secondary_icon_tooltip_text" translatable="yes">Clear entry</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="hexpand">True</property>
+            <property name="label" translatable="yes">Edit coordinates</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="edit-coord">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="secondary_icon_name">edit-clear-symbolic</property>
+            <property name="primary_icon_activatable">False</property>
+            <property name="primary_icon_sensitive">False</property>
+            <property name="secondary_icon_tooltip_text" translatable="yes">Clear entry</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="edit-combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">5</property>
+            <items>
+              <item translatable="yes">Extensions default weather provider</item>
+              <item>http://openweathermap.org</item>
+              <item>http://forecast.io</item>
+            </items>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparator" id="separator2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">baseline</property>
+            <property name="vexpand">False</property>
+            <child>
+              <object class="GtkButton" id="button-edit-cancel">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">start</property>
+                <accelerator key="Escape" signal="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button-edit-save">
+                <property name="label" translatable="yes">Save</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkAdjustment" id="forecast-refresh-adjustment">
+    <property name="lower">10</property>
+    <property name="upper">1440</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkMenu" id="search-menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+  </object>
+  <object class="GtkWindow" id="search-widget">
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="hide_titlebar_when_maximized">True</property>
+    <property name="type_hint">dialog</property>
+    <child>
+      <object class="GtkBox" id="search-box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="hexpand">True</property>
+            <property name="label" translatable="yes">Search by location or coordinates</property>
+            <property name="ellipsize">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkEntry" id="search-name">
+                <property name="width_request">350</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="secondary_icon_name">edit-clear-symbolic</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">False</property>
+                <property name="secondary_icon_tooltip_text" translatable="yes">Clear entry</property>
+                <property name="placeholder_text" translatable="yes">e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button-search-find">
+                <property name="label" translatable="yes">Find</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <accelerator key="Return" signal="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="search-combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">5</property>
+            <property name="active">0</property>
+            <items>
+              <item translatable="yes">Extensions default weather provider</item>
+              <item>http://openweathermap.org</item>
+              <item>http://forecast.io</item>
+            </items>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparator" id="separator1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">baseline</property>
+            <property name="vexpand">False</property>
+            <child>
+              <object class="GtkButton" id="button-search-cancel">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">start</property>
+                <accelerator key="Escape" signal="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button-search-save">
+                <property name="label" translatable="yes">Save</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkSpinner" id="spinner">
+    <property name="width_request">48</property>
+    <property name="height_request">48</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="active">True</property>
+  </object>
+  <object class="GtkListStore" id="tree-liststore">
     <columns>
-      <!-- column-name text -->
+      <!-- column-name location -->
+      <column type="gchararray"/>
+      <!-- column-name provider -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-	<col id="0"></col>
+        <col id="0">dummy</col>
+        <col id="1">dummy</col>
       </row>
     </data>
   </object>
-      <object class="GtkBox" id="main-widget">
-  	  <property name="border-width">14</property>
-		  <child>
-		    <object class="GtkTable" id="left-widget">
-		      <property name="visible">True</property>
-		      <property name="can_focus">False</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">1</property>
-		      <property name="column_spacing">6</property>
-		      <child>
-		        <object class="GtkScrolledWindow" id="tree-scrolledwindow">
-		          <property name="visible">True</property>
-		          <property name="can_focus">True</property>
-		          <property name="shadow_type">in</property>
-		          <property name="min_content_width">200</property>
-		          <property name="min_content_height">250</property>
-		          <child>
-		            <object class="GtkTreeView" id="tree-treeview">
-		              <property name="visible">True</property>
-		              <property name="can_focus">True</property>
-		              <property name="headers_visible">False</property>
-		              <property name="show_expanders">False</property>
-		              <property name="level_indentation">12</property>
-		              <child internal-child="selection">
-		                <object class="GtkTreeSelection" id="treeview-selection">
-				</object>
-				<object class="GtkTreeViewColumn" id="tree-treeviewcolumn">
-				</object>
-		              </child>
-		            </object>
-		          </child>
-		        </object>
-		        <packing>
-		          <property name="x_options">GTK_FILL</property>
-		        </packing>
-		      </child>
-		      <child>
-		        <object class="GtkToolbar" id="tree-toolbar">
-		          <property name="visible">True</property>
-		          <property name="can_focus">False</property>
-		          <property name="toolbar_style">icons</property>
-		          <property name="icon_size">1</property>
-		          <style>
-		            <class name="inline-toolbar"/>
-		          </style>
-		          <child>
-		            <object class="GtkToolButton" id="tree-toolbutton-add">
-		              <property name="visible">True</property>
-		              <property name="can_focus">False</property>
-		              <property name="use_action_appearance">False</property>
-		              <property name="icon_name">list-add-symbolic</property>
-		            </object>
-		            <packing>
-		              <property name="expand">False</property>
-		              <property name="homogeneous">True</property>
-		            </packing>
-		          </child>
-		          <child>
-		            <object class="GtkToolButton" id="tree-toolbutton-remove">
-		              <property name="visible">True</property>
-		              <property name="can_focus">False</property>
-		              <property name="use_action_appearance">False</property>
-		              <property name="icon_name">list-remove-symbolic</property>
-		            </object>
-		            <packing>
-		              <property name="expand">False</property>
-		              <property name="homogeneous">True</property>
-		            </packing>
-		          </child>
-		        </object>
-		        <packing>
-		          <property name="top_attach">1</property>
-		          <property name="bottom_attach">2</property>
-		          <property name="x_options">GTK_FILL</property>
-		          <property name="y_options">GTK_SHRINK</property>
-		        </packing>
-		      </child>
-		    </object>
-		  </child>
-		  <child>
-          <object class="GtkBox" id="right-widget">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="homogeneous">True</property>
-		  <child>
-				<object class="GtkTable" id="right-widget-table">
-				<property name="visible">True</property>
-				<property name="can_focus">False</property>
-				<property name="n_rows">12</property>
-				<property name="n_columns">2</property>
-				<property name="column_spacing">36</property>
-				<property name="row_spacing">12</property>
-				<property name="margin_left">36</property>
-				</object>
-		  </child>
+  <object class="GtkScrolledWindow" id="main-widget">
+    <property name="width_request">720</property>
+    <property name="height_request">480</property>
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="border_width">20</property>
+    <child>
+      <object class="GtkViewport" id="scrolled-viewport">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hscroll_policy">natural</property>
+        <property name="vscroll_policy">natural</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkNotebook" id="prefs-notebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="scrollable">True</property>
+            <property name="enable_popup">True</property>
+            <child>
+              <object class="GtkBox" id="locations-box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="tree-scrolledwindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <property name="min_content_width">300</property>
+                    <property name="min_content_height">250</property>
+                    <child>
+                      <object class="GtkTreeView" id="tree-treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">tree-liststore</property>
+                        <property name="reorderable">True</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <property name="level_indentation">12</property>
+                        <property name="tooltip_column">1</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection"/>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolbar" id="tree-toolbar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="toolbar_style">icons</property>
+                    <property name="icon_size">1</property>
+                    <child>
+                      <object class="GtkToolButton" id="tree-toolbutton-add">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">list-add</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="tree-toolbutton-remove">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">list-remove</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="tree-toolbutton-edit">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">gtk-edit</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="locations-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Locations</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="provider-grid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">10</property>
+                <property name="row_spacing">5</property>
+                <property name="column_spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="label-weather-provider">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Chose default weather provider</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-appid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Personal Api key from openweathermap.org</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="weather_provider">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>http://openweathermap.org</item>
+                      <item>http://forecast.io</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="appid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">32</property>
+                    <property name="width_chars">32</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="appid_fc">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">32</property>
+                    <property name="width_chars">32</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-appid-fc">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Personal Api key from forecast.io</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-current-refresh">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Refresh timeout for current weather [min]</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-forecast-refresh">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Refresh timeout for weather forecast [min]</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="spin-current-refresh">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="input_purpose">number</property>
+                    <property name="adjustment">current-refresh-adjustment</property>
+                    <property name="climb_rate">5</property>
+                    <property name="numeric">True</property>
+                    <property name="update_policy">if-valid</property>
+                    <property name="value">10</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="spin-forecast-refresh">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">Note: the forecast-timout is not used for forecast.io, because they do not provide seperate downloads for current weather and forecasts.</property>
+                    <property name="input_purpose">number</property>
+                    <property name="adjustment">forecast-refresh-adjustment</property>
+                    <property name="climb_rate">5</property>
+                    <property name="numeric">True</property>
+                    <property name="value">10</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparator" id="separator3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-use-default-owm-appid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="label" translatable="yes">Use extensions api-key for openweathermap.org</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="use_default_owm_key">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">Switch off, if you have your own api-key for openweathermap.org and put it into the text-box below.</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="provider-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Weather provider</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="geolocation-grid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">10</property>
+                <property name="row_spacing">5</property>
+                <property name="column_spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="label-geolocation-provider">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Chose geolocation provider</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="geolocation_provider">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>https://nominatim.openstreetmap.org/</item>
+                      <item>https://geocode.farm/</item>
+                      <item>https://open.mapquestapi.com/nominatim/</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-geolocation-appid-mapquest">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Personal AppKey from developer.mapquest.com</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="geolocation_appid_mapquest">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="max_length">32</property>
+                    <property name="width_chars">32</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="geolocation-provider-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Geolocation provider</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="units-grid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">10</property>
+                <property name="row_spacing">5</property>
+                <property name="column_spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="label-units">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Temperature Unit</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-wind-speed-unit">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Wind Speed Unit</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-pressure-unit">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Pressure Unit</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="units">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>°C</item>
+                      <item>°F</item>
+                      <item>K</item>
+                      <item>°Ra</item>
+                      <item>°Ré</item>
+                      <item>°Rø</item>
+                      <item>°De</item>
+                      <item>°N</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="wind_speed_unit">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>km/h</item>
+                      <item>mph</item>
+                      <item>m/s</item>
+                      <item>kn</item>
+                      <item>ft/s</item>
+                      <item>Beaufort</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="pressure_unit">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>hPa</item>
+                      <item>inHg</item>
+                      <item>bar</item>
+                      <item>Pa</item>
+                      <item>kPa</item>
+                      <item>atm</item>
+                      <item>at</item>
+                      <item>Torr</item>
+                      <item>psi</item>
+                      <item>mmHg</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="units-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Units</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="layout-grid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">10</property>
+                <property name="row_spacing">5</property>
+                <property name="column_spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="label-position-in-panel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Position in Panel</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-wind-direction">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Wind Direction by Arrows</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-translate-condition">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Translate Conditions</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-icon-type">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Symbolic Icons</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-use-text-on-buttons">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Text on buttons</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-text-in-panel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Temperature in Panel</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-comment-in-panel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Conditions in Panel</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-comment-in-forecast">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Conditions in Forecast</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-center-in-forecast">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Center forecast</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-days-forecast">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Number of days in forecast</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">9</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-decimal-places">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Maximal number of digits after the decimal point</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">10</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="position_in_panel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item translatable="yes">Center</item>
+                      <item translatable="yes">Right</item>
+                      <item translatable="yes">Left</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="wind_direction">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="translate_condition">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="icon_type">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="use_text_on_buttons">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="text_in_panel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="comment_in_panel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="comment_in_forecast">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSwitch" id="center_forecast">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="days_forecast">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>2</item>
+                      <item>3</item>
+                      <item>4</item>
+                      <item>5</item>
+                      <item>6</item>
+                      <item>7</item>
+                      <item>8</item>
+                      <item>9</item>
+                      <item>10</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">9</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="decimal_places">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <items>
+                      <item>0</item>
+                      <item>1</item>
+                      <item>2</item>
+                      <item>3</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">10</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="layout-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Layout</property>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="about">
+                <property name="can_focus">False</property>
+                <property name="margin_top">24</property>
+                <property name="margin_bottom">24</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkImage" id="logo-image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">OpenWeather.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="padding">10</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="extension-label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">&lt;b&gt;OPenweather&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <child>
+                      <object class="GtkLabel" id="version-label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">Version: </property>
+                        <property name="track_visited_links">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="version">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">unknown (self-build ?)</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="description-label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;span&gt;Weather extension to display weather information from &lt;a href="https://openweathermap.org/"&gt;Openweathermap&lt;/a&gt; or &lt;a href="https://forecast.io"&gt;forecast.io&lt;/a&gt; for almost all locations in the world.&lt;/span&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                    <property name="wrap">True</property>
+                    <property name="wrap_mode">word-char</property>
+                    <property name="max_width_chars">1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Maintained by</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label">Jens Lody (&lt;a href="mailto:openweather@jenslody.de"&gt;openweather@jenslody.de&lt;/a&gt;)</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLinkButton" id="github-link">
+                    <property name="label" translatable="yes">Webpage</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events"/>
+                    <property name="opacity">0.99999999977648257</property>
+                    <property name="halign">center</property>
+                    <property name="relief">none</property>
+                    <property name="uri">https://github.com/jenslody/gnome-shell-extension-openweather</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="valign">end</property>
+                    <property name="label" translatable="yes">&lt;span size="small"&gt;This program comes with ABSOLUTELY NO WARRANTY.
+See the &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, version 2 or later&lt;/a&gt; for details.&lt;/span&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">6</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="about-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">About</property>
+              </object>
+              <packing>
+                <property name="position">5</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-          </packing>
-		  </child>
-		</object>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/debian/bzr-builder.manifest gnome-shell-extension-weather-0~20151114.git609/debian/bzr-builder.manifest
--- gnome-shell-extension-weather-0~20140924.git7e28508/debian/bzr-builder.manifest	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/debian/bzr-builder.manifest	2015-11-17 15:10:33.000000000 +0000
@@ -0,0 +1,3 @@
+# bzr-builder format 0.3 deb-version 0~20151114.git609-0
+lp:~baltix/gnome-shell-extension-weather/gs-extension-openweather revid:git-v1:6337eb2f018d61aba35d2a28724a12cb91cc1830
+nest-part packaging lp:debian/gnome-shell-extension-weather debian debian revid:package-import@ubuntu.com-20151003115849-qgo58rez2gdrem2n
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/debian/changelog gnome-shell-extension-weather-0~20151114.git609/debian/changelog
--- gnome-shell-extension-weather-0~20140924.git7e28508/debian/changelog	2014-09-24 18:20:37.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/debian/changelog	2015-11-17 15:10:33.000000000 +0000
@@ -1,3 +1,25 @@
+gnome-shell-extension-weather (0~20151114.git609-0~ubuntu15.04.1) vivid; urgency=low
+
+  * Auto build.
+
+ -- Mantas Kriaučiūnas <mantas@akl.lt>  Tue, 17 Nov 2015 15:10:33 +0000
+
+gnome-shell-extension-weather (0~20151003.git339ec8a-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * d/control: this release is compatible with GNOME 3.18.
+  * d/copyright: reflect upstream changes.
+  * d/NEWS: fix urgency of latest entry to make lintian happy.
+
+ -- Sébastien Villemot <sebastien@debian.org>  Sat, 03 Oct 2015 11:58:49 +0200
+
+gnome-shell-extension-weather (0~20150615.git0162cf7-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+    Compatible with GNOME Shell 3.16. (Closes: #788789)
+
+ -- Sébastien Villemot <sebastien@debian.org>  Mon, 15 Jun 2015 22:49:47 +0200
+
 gnome-shell-extension-weather (0~20140924.git7e28508-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/debian/control gnome-shell-extension-weather-0~20151114.git609/debian/control
--- gnome-shell-extension-weather-0~20140924.git7e28508/debian/control	2014-09-24 18:22:12.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/debian/control	2015-11-17 15:10:33.000000000 +0000
@@ -13,8 +13,8 @@
 Package: gnome-shell-extension-weather
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-shell (>= 3.8),
-         gnome-shell (<< 3.15),
+         gnome-shell (>= 3.12),
+         gnome-shell (<< 3.19),
          gir1.2-clutter-1.0,
          gir1.2-glib-2.0,
          gir1.2-gtk-3.0,
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/debian/copyright gnome-shell-extension-weather-0~20151114.git609/debian/copyright
--- gnome-shell-extension-weather-0~20140924.git7e28508/debian/copyright	2014-05-09 19:42:23.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/debian/copyright	2015-11-17 15:10:33.000000000 +0000
@@ -4,7 +4,7 @@
 Source: https://github.com/jenslody/gnome-shell-extension-openweather
 
 Files: *
-Copyright: 2011-2013
+Copyright: 2011-2015
            Elad Alfassa <elad@fedoraproject.org>
            Mark Benjamin <weather.gnome.Markie1@dfgh.net>
            Simon Claessens <gagalago@gmail.com>
@@ -43,7 +43,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2013-2014 Sébastien Villemot <sebastien@debian.org>
+Copyright: 2013-2015 Sébastien Villemot <sebastien@debian.org>
 License: GPL-3+
 
 License: GPL-3+
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/debian/NEWS gnome-shell-extension-weather-0~20151114.git609/debian/NEWS
--- gnome-shell-extension-weather-0~20140924.git7e28508/debian/NEWS	2014-05-09 19:42:23.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/debian/NEWS	2015-11-17 15:10:33.000000000 +0000
@@ -1,3 +1,10 @@
+gnome-shell-extension-weather (0~20150615.git0162cf7-1) unstable; urgency=medium
+
+  After this upgrade, all city locations must be deleted and the re-added.
+  Otherwise the weather information will not load correctly.
+
+ -- Sébastien Villemot <sebastien@debian.org>  Mon, 15 Jun 2015 23:03:25 +0200
+
 gnome-shell-extension-weather (0~20140506.gitbad1a58-1) unstable; urgency=low
 
   Starting with this release, weather data is fetched from OpenWeatherMap
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/debian/source/format gnome-shell-extension-weather-0~20151114.git609/debian/source/format
--- gnome-shell-extension-weather-0~20140924.git7e28508/debian/source/format	2013-03-05 21:46:07.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/debian/source/format	2015-11-17 15:10:33.000000000 +0000
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/gnome-shell-extension-openweather.cbp gnome-shell-extension-weather-0~20151114.git609/gnome-shell-extension-openweather.cbp
--- gnome-shell-extension-weather-0~20140924.git7e28508/gnome-shell-extension-openweather.cbp	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/gnome-shell-extension-openweather.cbp	2015-11-17 15:10:32.000000000 +0000
@@ -29,6 +29,7 @@
 		<Unit filename="autogen.sh" />
 		<Unit filename="configure.ac" />
 		<Unit filename="data/Makefile.am" />
+		<Unit filename="data/OpenWeather.png" />
 		<Unit filename="data/Screenshot.jpg" />
 		<Unit filename="data/metadata.json.in" />
 		<Unit filename="data/org.gnome.shell.extensions.openweather.gschema.xml.in" />
@@ -47,7 +48,7 @@
 		<Unit filename="po/es.po" />
 		<Unit filename="po/fi.po" />
 		<Unit filename="po/fr.po" />
-		<Unit filename="po/gnome-shell-extension-weather.pot" />
+		<Unit filename="po/gnome-shell-extension-openweather.pot" />
 		<Unit filename="po/he.po" />
 		<Unit filename="po/hu.po" />
 		<Unit filename="po/it.po" />
@@ -70,7 +71,10 @@
 		<Unit filename="src/Makefile.am" />
 		<Unit filename="src/convenience.js" />
 		<Unit filename="src/extension.js" />
+		<Unit filename="src/forecast_io.js" />
+		<Unit filename="src/openweathermap_org.js" />
 		<Unit filename="src/prefs.js" />
+		<Unit filename="update_revision.sh" />
 		<Extensions>
 			<envvars />
 			<code_completion />
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/gnome-shell-extension-openweather.spec gnome-shell-extension-weather-0~20151114.git609/gnome-shell-extension-openweather.spec
--- gnome-shell-extension-weather-0~20140924.git7e28508/gnome-shell-extension-openweather.spec	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/gnome-shell-extension-openweather.spec	2015-11-17 15:10:32.000000000 +0000
@@ -1,38 +1,47 @@
-%global git 2701627
+%global git 6368d32
 %global uuid openweather-extension@jenslody.de
 %global github jenslody-gnome-shell-extension-openweather
 %global checkout git%{git}
+%global checkout_date 20151108
+
 
 Name:           gnome-shell-extension-openweather
-Version:        0
-Release:        0.2.%(date +%Y%m%d).%{checkout}%{?dist}
-Summary:        An extension for displaying weather notifications from http://openweathermap.org in GNOME Shell
+Version:        1
+Release:        0.10.%{checkout_date}%{checkout}%{?dist}
+Summary:        Display weather information from many locations in the world
 
 Group:          User Interface/Desktops
-License:        GPLv3+
+
+# The entire source code is GPLv3+ except convenience.js, which is BSD
+License:        GPLv3+ and BSD
 URL:            https://github.com/jenslody/gnome-shell-extension-openweather
 Source0:        https://github.com/jenslody/gnome-shell-extension-openweather/tarball/master/%{github}-%{git}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  autoconf >= 2.53, automake >= 1.9, glib2-devel, gnome-common >= 3.6.0, intltool >= 0.25
-Requires:       gnome-shell >= 3.6.0
+BuildRequires:  autoconf, automake, glib2-devel, gnome-common >= 3.12.0, intltool
+Requires:       gnome-shell >= 3.12.0
 
 %description
 gnome-shell-extension-openweather is an extension to display weather information
-from http://openweathermap.org/ for many cities in GNOME Shell
+from http://openweathermap.org/ or http://forecast.io for (almost) all locations
+of the world in GNOME Shell.
 
 %prep
 %setup -q -n %{github}-%{git}
 
 %build
 NOCONFIGURE=1 ./autogen.sh
-%configure --prefix=%{_prefix}
+%configure --prefix=%{_prefix} GIT_VERSION=%{checkout}
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
+# Fedora uses file-triggers for some stuff (e.g. compile schemas) since fc24.
+# Compiling schemas is the only thing done in %%postun and %%posttrans, so
+# I decided to make both completely conditional.
+%if 0%{?fedora} < 24
 %postun
 if [ $1 -eq 0 ] ; then
         %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
@@ -40,13 +49,61 @@
 
 %posttrans
 %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+%endif
 
 %files -f %{name}.lang
-%doc AUTHORS COPYING README.md
+%license COPYING
+%doc AUTHORS README.md
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.openweather.gschema.xml
-%{_datadir}/gnome-shell/extensions/%{uuid}/
+%if 0%{?fedora} < 23
+%dir %{_datadir}/gnome-shell/extensions
+%endif
+%{_datadir}/gnome-shell/extensions/%{uuid}
 
 %changelog
-* Fri Nov 08 2013 Jens Lody <jens@jenslody.de> - 0-0.1.git0d20641
-- Initial package for Fedora of the weather-extension fork using http://openweathermap.org
+* Sun Nov 08 2015 Jens Lody <fedora@jenslody.de> - 1-0.10.20151108git6368d32
+- Fix typo in metadata.json .
+
+* Sun Nov 08 2015 Jens Lody <fedora@jenslody.de> - 1-0.9.20151108gite4dbfee
+- Add default API-key for openweathermap.org. The key is in their FOSS-whitelist
+  now. Thanks to openweathermap.org .
+
+* Sat Nov 07 2015 Jens Lody <fedora@jenslody.de> - 1-0.8.20151107gitae12283
+- Fixes #1278686, can block gnome-shell temporarily in some cases .
+  See also: https://github.com/jenslody/gnome-shell-extension-openweather/issues/82 .
+
+* Sat Oct 17 2015 Jens Lody <fedora@jenslody.de> - 1-0.7.20151017git34aa242
+- Bug fix: warn message for empty forecast.io api-key was shown if the key
+  exists, not the if the key was empty, sorry.
+
+* Fri Oct 16 2015 Jens Lody <fedora@jenslody.de> - 1-0.6.20151016git13f9abf
+- Bug fix: forecast.io no longer accepts non-https requests.
+- Updated russioan translation, added indonesian translation.
+- Add warn-message if an api-key is empty.
+
+* Sat Oct 10 2015 Jens Lody <fedora@jenslody.de> - 1-0.5.20151010gitfe00513
+- New upstream:
+  make refresh-intervall configurable,
+  fix minor issue, when last location is removed,
+  add new languages for forecast.io.
+
+* Thu Sep 24 2015 Jens Lody <fedora@jenslody.de> - 1-0.4.20150924gite55253e
+- Always depend on gnome-shell (it's needed anyway).
+- On Fedora < 23 own the extensions dir explicitely to avoid unowned
+  directories.
+
+* Thu Sep 24 2015 Jens Lody <fedora@jenslody.de> - 1-0.3.20150924gite55253e
+- Do not require gnome-shell-extensions-common.
+- Require gnome-shell instead on Fedora >= 23.
+
+* Thu Sep 24 2015 Jens Lody <fedora@jenslody.de> - 1-0.2.20150924gite55253e
+- Use checkout-date instead of build-date in package-version.
+
+* Thu Aug 20 2015 Jens Lody <fedora@jenslody.de> - 1-0.1.20150821gitcb1f6f6
+- Remove dot before git in Release-tag.
+- Use (conditional) file-triggers for schema compiling, introduced in fc24.
+
+* Sat Jul 25 2015 Jens Lody <fedora@jenslody.de> - 1-0.1.20150725.git377244c
+- Initial package for Fedora of the weather-extension fork using
+  http://openweathermap.org or http://forecast.io.
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/bg.po gnome-shell-extension-weather-0~20151114.git609/po/bg.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/bg.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/bg.po	2015-11-17 15:10:32.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2014-03-28 18:57+0200\n"
 "Last-Translator: Svetlin Zarev <svetlin.zarev@mail.ru>\n"
 "Language-Team: Български <>\n"
@@ -19,520 +19,726 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Схемата \"%s\" не е намерена"
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "%s не може да бъде отворен"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Местоположения"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Опресни информацията"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Информацията е предоставена от:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "%s не може да бъде отворен"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Настройки"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Грешен град"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "спокойно"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Лек полъх"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Лек бриз"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Light breeze"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Умерен бриз"
+
+#: ../src/extension.js:997
+#, fuzzy
+msgid "Fresh breeze"
+msgstr "Бриз"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Силен бриз"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Умерен вихър"
+
+#: ../src/extension.js:1006
+#, fuzzy
+msgid "Fresh gale"
+msgstr "Вихър"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Силен вихър"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Буря"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Силна буря"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Ураган"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Неделя"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Понеделник"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Вторник\t\t"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Сряда"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Четвъртък"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Петък"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Събота"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "С"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "СИ"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "И"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "ЮИ"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "Ю"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "ЮЗ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "З"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "СЗ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Зареждане..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Моля изчакайте"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Облачност:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Влажност"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Налягане"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Вятър"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Вчера"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Преди %s дни"
+msgstr[1] "Преди %s дни"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Днес"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Утре"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "До %s дни"
+msgstr[1] "До %s дни"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "лек дъжд с гръмотевици"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "дъжд с гръмотевици"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "проливен дъжд с гръмотевици"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "слаба гръмотевична буря"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "гръмотевична буря"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "силна гръмотевична буря"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "гръмотевична буря"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "гръмотевична буря с лек дъждец"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "гръмотевична буря със ситен дъжд"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 #, fuzzy
 msgid "thunderstorm with heavy drizzle"
 msgstr "гръмотевична буря със ситен дъжд"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "лек ситен дъжд"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "ситен дъжд"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 #, fuzzy
 msgid "heavy intensity drizzle"
 msgstr "силен ръмеж"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 #, fuzzy
 msgid "light intensity drizzle rain"
 msgstr "лек ръмеж"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "ситен дъжд"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 #, fuzzy
 msgid "heavy intensity drizzle rain"
 msgstr "силен ръмеж"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "дъжд"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 #, fuzzy
 msgid "heavy shower rain and drizzle"
 msgstr "силен дъжд"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "силен ръмеж"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "лек дъжд"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "умерен валеж"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "силен дъжд"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "много силен дъжд"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "много силен дъжд"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "леден дъжд"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 #, fuzzy
 msgid "light intensity shower rain"
 msgstr "слаб дъжд"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 #, fuzzy
 msgid "shower rain"
 msgstr "дъжд"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 #, fuzzy
 msgid "heavy intensity shower rain"
 msgstr "силен дъжд"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 #, fuzzy
 msgid "ragged shower rain"
 msgstr "дъжд"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "лек снеговалеж"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "снеговалеж"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "силен снеговалеж"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "суграшица"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "суграшица"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "слаба  суграшица"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "суграшица"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "лек снеговалеж"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "снеговалеж"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "силен снеговалеж"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "мъгла"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "дим"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "мараня"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "пясъчни завихряния"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "мъгла"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "пясък"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "прах"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "вулканична пепел"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "вихрушки"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "торнадо"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "безоблачно"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "слаба облачност"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "разкъсана облачност"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "разкъсана облачност"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "заоблачено"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Не е налично"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "спокойно"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Лек полъх"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Лек бриз"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Light breeze"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Умерен бриз"
-
-#: ../src/extension.js:1242
-#, fuzzy
-msgid "Fresh breeze"
-msgstr "Бриз"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Силен бриз"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Умерен вихър"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Схемата \"%s\" не е намерена"
 
-#: ../src/extension.js:1251
+#: ../src/prefs.js:393
 #, fuzzy
-msgid "Fresh gale"
-msgstr "Вихър"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Силен вихър"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Буря"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Силна буря"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Ураган"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Неделя"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Понеделник"
+msgid "Location"
+msgstr "Местоположения"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Вторник\t\t"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Сряда"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Да се премахне ли %s ?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Четвъртък"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Петък"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Събота"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "С"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "СИ"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "И"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "ЮИ"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "Ю"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "ЮЗ"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "З"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "СЗ"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Вчера"
+#: ../data/weather-settings.ui:494
+#, fuzzy
+msgid "Personal Api key from openweathermap.org"
+msgstr "Личен API код от openweather.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "Преди %s дни"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Личен API код от openweather.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Днес"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Утре"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "До %s дни"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Зареждане на моментната информация"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Зареждане..."
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Личен API код от openweather.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Моля изчакайте"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Облачност:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Информацията е предоставена от:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Влажност"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Налягане"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Личен API код от openweather.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Вятър"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Информацията е предоставена от:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Мерна единица за температура"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Мерна единица за скорост на вятъра"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Мерна единица за налягане"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Позиция в панела"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Центрирано"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "В дясно"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "В ляво"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Посока на вятъра със стрелки"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Превеждай информацията за времето"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Символни икони"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Показвай температурата в панела"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Информация за времето в панела"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Информация за времето в панела"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Прогнозата да се показва в центъра"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 #, fuzzy
 msgid "Number of days in forecast"
 msgstr "Дни в прогнозата"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Брой знаци след десетичната точка"
 
-#: ../src/prefs.js:154
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Центрирано"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "В дясно"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "В ляво"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Зареждане на моментната информация"
+
 #, fuzzy
-msgid "Personal Api key from openweathermap.org"
-msgstr "Личен API код от openweather.org"
+#~ msgid "In %d days"
+#~ msgstr "До %s дни"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Населено място"
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Преди %s дни"
+#~ msgstr[1] "Преди %s дни"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Да се премахне ли %s ?"
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Преди %s дни"
+#~ msgstr[1] "Преди %s дни"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "До %s дни"
+#~ msgstr[1] "До %s дни"
+
+#~ msgid "Name of the city"
+#~ msgstr "Населено място"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Зареждане на прогнозната информация"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/ca.po gnome-shell-extension-weather-0~20151114.git609/po/ca.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/ca.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/ca.po	2015-11-17 15:10:32.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:37+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: Softcatalà\n"
@@ -18,524 +18,731 @@
 "X-Generator: Virtaal 0.7.0-rc1\n"
 "X-Project-Style: default\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr ""
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "No es pot obrir %s"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
-msgstr ""
+msgstr "Ubicacions"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
-msgstr ""
+msgstr "Actualitza la informació del temps"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr ""
+msgstr "Informació del temps proporcionada per:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr ""
+msgstr "No es pot obrir %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
-msgstr ""
+msgstr "Preferències"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
+msgstr "Ciutat no vàlida"
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Calma"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Ventolina"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Vent fluixet"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Vent fluix"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Vent moderat"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Vent fresquet"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Vent fresc"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Vent fort"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Temporal"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Temporal fort"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Tempesta"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Tempesta intensa"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Huracà"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Dilluns"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Dijous"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Divendres"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NO"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "S'està carregant..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Espereu"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Nuvolositat:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Humitat:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Pressió:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vent:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Ahir"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Fa %s dies"
+msgstr[1] "Fa %s dies"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Avui"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Demà"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "En %s dies"
+msgstr[1] "En %s dies"
+
+#: ../src/openweathermap_org.js:181
+msgid "thunderstorm with light rain"
+msgstr "Tempestes amb pluges dèbils"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
-msgstr "Tempestes"
+msgstr "Tempestes amb pluges"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Tempestes amb fortes pluges"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Tempestes aïllades"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Tempestes"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Tempestes elèctriques severes"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Tempestes aïllades"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Tempesta amb plugim dèbil"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Tempestes amb plugim"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Tempestes amb plugim persistent"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "Plugim dèbil"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Plugim"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Plugim intens"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Plugim dèbil"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Plugim"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Plugim persistent"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Barreja de pluja i calamarsa"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Barreja de xàfecs i plugim"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Plugims gelats"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Pluja glaçada"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
-msgstr ""
+msgstr "Pluja moderada"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
-msgstr ""
+msgstr "Pluja intensa"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
-msgstr ""
+msgstr "Pluja molt intensa"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Pluja glaçada"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Pluja glaçada"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Xàfecs de baixa intensitat"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
-msgstr ""
+msgstr "Xàfecs"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Xàfects de gran intessitat"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
-msgstr ""
+msgstr "Xàfecs aïllats"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Neu aixecada pel vent"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
-msgstr ""
+msgstr "Neu"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Nevada forta"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Aiguaneu"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Ruixats"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Barreja de pluja i neu"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Barreja de pluja i neu"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Precipitacions lleugeres de neu"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Ruixats"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Nevada forta"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
-msgstr ""
+msgstr "Boirina"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
-msgstr ""
+msgstr "Boira"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
-msgstr ""
+msgstr "Calitja"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
-msgstr ""
+msgstr "Remolins d'arena"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Boirós"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
-msgstr ""
+msgstr "Arena"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
-msgstr ""
+msgstr "Pols"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
-msgstr ""
+msgstr "CENDRA VOLCÀNICA"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
-msgstr ""
+msgstr "BORRASCA"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
-msgstr ""
+msgstr "TORNADO"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
-msgstr ""
+msgstr "Cel clar"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr ""
+msgstr "Alguns núvols"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Pluges aïllades"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
-msgstr ""
+msgstr "Núvols trencats"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Majoritàriament ennuvolat"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "No disponible"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr ""
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "No s'ha pogut trobar l'esquema \"%s\". "
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr ""
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr ""
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Ubicacions"
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr ""
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Voleu esborrar %s ?"
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Clar"
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Huracà"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Dilluns"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Dijous"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Divendres"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr ""
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Clau Api personal de openweathermap.org"
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr ""
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Clau Api personal de openweathermap.org"
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Avui"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Demà"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Clau Api personal de openweathermap.org"
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "S'està carregant el temps actual..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "S'està carregant..."
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Espereu"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Informació del temps proporcionada per:"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Humitat:"
-
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Pressió:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Clau Api personal de openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vent:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Informació del temps proporcionada per:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatura:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
-msgstr ""
+msgstr "Unitat de velocitat:"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Pressió:"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr ""
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Posició:"
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
-msgstr ""
+msgstr "Direcció del vent amb fletxes"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
-msgstr ""
+msgstr "Condicions climàtiques traduïdes"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
-msgstr ""
+msgstr "Icones simbòliques"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
-msgstr ""
+msgstr "Text sobre els botons"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatura:"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
-msgstr ""
+msgstr "Condicions climàtiques:"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Condicions climàtiques:"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr ""
+msgstr "Centrar les prediccions"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
-msgstr ""
+msgstr "Nombre de dies de les prediccions"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centre"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Dreta"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Esquerra"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
 msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
 msgstr ""
 
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "S'està carregant el temps actual..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "En %s dies"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Fa %s dies"
+#~ msgstr[1] "Fa %s dies"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Fa %s dies"
+#~ msgstr[1] "Fa %s dies"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "En %s dies"
+#~ msgstr[1] "En %s dies"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nom de la ciutat"
+
 #~ msgid "Loading future weather ..."
 #~ msgstr "S'està carregant el temps futur..."
 
@@ -584,9 +791,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Parcialment ennuvolat"
 
-#~ msgid "Clear"
-#~ msgstr "Clar"
-
 #~ msgid "Sunny"
 #~ msgstr "Assolellat"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/cs.po gnome-shell-extension-weather-0~20151114.git609/po/cs.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/cs.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/cs.po	2015-11-17 15:10:32.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-06-03 23:07+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: cs_CZ <czech@li.org>\n"
@@ -18,495 +18,705 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "…"
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schéma \"%s\" nenalezeno."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Nemohu otevřít %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Místa"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Obnovit informace o počasí"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Data o počasí poskytuje:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "Nemohu otevřít %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Nastavení"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Neplatné město"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Klid"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Vánek"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Mírný vítr"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Střední vítr"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Čerstvý vítr"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Silný vítr"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Vichřice"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Vichřice"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Silná vichřice"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Bouřka"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Silná bouřka"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Hurikán"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Neděle"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Pondělí"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Úterý"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Středa"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Čtvrtek"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Pátek"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sobota"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "SV"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "V"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "JV"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "J"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "JZ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "Z"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "SZ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Načítání…"
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Čekejte"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Oblačnost:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Vlhkost:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Tlak:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vítr:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Včera"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s dní zpátky"
+msgstr[1] "%s dní zpátky"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Dnes"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Zítra"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "%s dní zpátky"
+msgstr[1] "%s dní zpátky"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "bouřky a mírný déšť"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "bouřky"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "bouřky a intenzivní déšť"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "ojedinělé bouřky"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "Bouřky"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "četné bouřky"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "ojedinělé bouřky"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "bouřky a mírný déšť"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "bouřky"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "bouřky a intenzivní déšť"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
+#, fuzzy
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "slabé mrholení"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "mrholení"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "silné mrholení"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "slabé mrholení"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "mrholení"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "silné mrholení"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "mrholení"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "silné mrholení"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "mrholení"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "mírný déšť"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "střední déšť"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "silný déšť"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "velmi silný déšť"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "intenzivní déšť"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "namrzající déšť"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "mírný déšť"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "déšť"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "silný déšť"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "velmi silný déšť"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "mírné sněžení"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "sníh"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "husté sněžení"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "plískanice"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "plískanice"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "mírný déšť se sněhem"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "déšť se sněhem"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "Mírné sněžení"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "sněhové přeháňky"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "husté sněžení"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "mlha"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "smog"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "opar"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "Písečné/prachové víry"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "mlha"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "písek"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "prach"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "SOPEČNÝ POPEL"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "NÁPORY VĚTRU"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "TORNÁDO"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "jasno"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "polojasno"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "Občasné přeháňky"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "Polojasno"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "Převážně zataženo"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Není k dispozici"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Klid"
-
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Vánek"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Mírný vítr"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Střední vítr"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Čerstvý vítr"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Silný vítr"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Vichřice"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Vichřice"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Silná vichřice"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Bouřka"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Silná bouřka"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Hurikán"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Neděle"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schéma \"%s\" nenalezeno."
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Pondělí"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Místa"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Úterý"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Středa"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Odstranit %s?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Čtvrtek"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Pátek"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sobota"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "S"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "SV"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "V"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "JV"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "J"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "JZ"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "Z"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "SZ"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Včera"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Osobní Api klíč z openweathermap.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s dní zpátky"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Osobní Api klíč z openweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Dnes"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Zítra"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, fuzzy, python-format
-msgid "In %s days"
-msgstr "%s dní zpátky"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Načítání aktuálního počasí…"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Načítání…"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Osobní Api klíč z openweathermap.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Čekejte"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Oblačnost:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Data o počasí poskytuje:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Vlhkost:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Tlak:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Osobní Api klíč z openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vítr:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Data o počasí poskytuje:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Jednotka teploty"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Jednotka rychlosti větru"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Jednotka tlaku:"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Pozice na panelu"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "uprostřed"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "vpravo"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "vlevo"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Směr větru podle šipek"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Překládat podmínky"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Použít symbolické ikony"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Zobrazit na panelu teplotu"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Zobrazit na panelu podmínky"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Zobrazit na panelu podmínky"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Počet dní k předpovědi"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Maximální množství čísel za desetinnou čárkou"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "Osobní Api klíč z openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "uprostřed"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Název města"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "vpravo"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Odstranit %s?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "vlevo"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Načítání aktuálního počasí…"
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "%s dní zpátky"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dní zpátky"
+#~ msgstr[1] "%s dní zpátky"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dní zpátky"
+#~ msgstr[1] "%s dní zpátky"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "%s dní zpátky"
+#~ msgstr[1] "%s dní zpátky"
+
+#~ msgid "Name of the city"
+#~ msgstr "Název města"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/da.po gnome-shell-extension-weather-0~20151114.git609/po/da.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/da.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/da.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-04-07 03:07+0200\n"
 "Last-Translator: Michael Rasmussen <mir@datanom.net>\n"
 "Language-Team: Danish <>\n"
@@ -17,526 +17,716 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr ""
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schema \"%s\" blev ikke fundet."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr ""
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr ""
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Tyfon"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Søndag"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Mandag"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Tirsdag"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Fredag"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Lørdag"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NØ"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "Ø"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SØ"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SV"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "V"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NV"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Henter ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Vent venligst"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Fugtighed:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Tryk:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vind:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "I dag"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "I morgen"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Tordenvejr"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Tordenvejr"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Tordenvejr"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Lokale tordenbyger"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Tordenvejr"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Kraftigt tordenvejr"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Lokale tordenbyger"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Tordenvejr"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Tordenvejr"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Tordenvejr"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Dugregn"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Regn og hagl"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Dugregn"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Dugregn"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Dugregn"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Regn og hagl"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Regn og hagl"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Frysende dugregn"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Isslag"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Dugregn"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Isslag"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Isslag"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Lette snebyger"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Byger"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Kraftig sne"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Snestorm"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Kraftig sne"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Slud"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Byger"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Regn og slud"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Regn og slud"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Lette snebyger"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Byger"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Kraftig sne"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Tåge"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Næsten overskyet"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Spredte regnbyger"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Næsten overskyet"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Næsten overskyet"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Ikke tilgængelig"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr ""
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schema \"%s\" blev ikke fundet."
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Klart"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Tyfon"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Søndag"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Mandag"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Fredag"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Lørdag"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NØ"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "Ø"
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SØ"
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
-
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SV"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "V"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NV"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "I dag"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "I morgen"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Henter nuværende vejrdata"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Henter ..."
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Vent venligst"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Fugtighed:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Tryk:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vind:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 #, fuzzy
 msgid "Temperature Unit"
 msgstr "Temperatur"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr ""
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Tryk:"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Left"
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
 msgstr ""
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr ""
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr ""
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 #, fuzzy
 msgid "Temperature in Panel"
 msgstr "Temperatur"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr ""
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
+#: ../data/weather-settings.ui:992
+msgid "Right"
 msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
 msgstr ""
 
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Henter nuværende vejrdata"
+
 #~ msgid "Loading future weather ..."
 #~ msgstr "Henter fremtidige vejrdata"
 
@@ -585,9 +775,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Let overskyet"
 
-#~ msgid "Clear"
-#~ msgstr "Klart"
-
 #~ msgid "Sunny"
 #~ msgstr "Solrigt"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/de.po gnome-shell-extension-weather-0~20151114.git609/po/de.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/de.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/de.po	2015-11-17 15:10:32.000000000 +0000
@@ -1,511 +1,705 @@
 # German translation for gnome-shell-extension-openweather
-# Copyright (C) 2011
+# Copyright (C) 2011-2015 Jens Lody
 # This file is distributed under the same license as the gnome-shell-extension-openweather package.
-# Evilandi666 <Evilandi.AUR@googlemail.com>, 2011.
+# Jens Lody <openweather@jenslody.de>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: gnome-shell-extension-openweather\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
-"PO-Revision-Date: 2013-02-14 03:49+0100\n"
-"Last-Translator: Christian METZLER (Neroth) <neroth@xeked.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-11-14 11:07+0100\n"
+"Last-Translator: Jens Lody <openweather@jenslody.de>\n"
+"Language-Team: Deutsch <openweather@jenslody.de>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schema \"%s\" nicht gefunden."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Openweathermap.org kann nicht ohne einen api-key genutzt werden.\n"
+"Entweder den Schalter zur Benutzung des Standard API-keys in Einstellungs-"
+"Dialog auf an schalten oder auf http://openweathermap.org/appid anmelden und "
+"den persönlichen Schlüssel in den Dialog kopieren."
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Forecast.io kann nicht ohne einen api-key genutzt werden.\n"
+"Bitte auf https://developer.forecast.io/register anmelden und den "
+"persönlichen Schlüssel in den Einstellungs-Dialog kopieren."
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr "Kann %s nicht erreichen"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Standorte"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Aktualisiere Wetterdaten"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Wetterdaten zur Verfügung gestellt von:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr "Kann %s nocht öffnen"
+msgstr "Kann %s nicht öffnen"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Einstellungen für Wetter"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Ungültige Ortschaft"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "Ungültiger Ort! Bitte versuchen Sie ihn neu anzulegen."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Still"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Leichter Windzug"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Leichte Brise"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Schwache Brise"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Mäßige Brise"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Frische Brise"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Starker Wind"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Steifer Wind"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Stürmischer Wind"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Sturm"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Schwerer Sturm"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Orkanartiger Sturm"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Orkan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Montag"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NO"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SW"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "W"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NW"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Lade ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Bewölkung:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Luftfeuchtigkeit:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Luftdruck:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Windgeschwindigkeit:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Gestern"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Vor %d Tag"
+msgstr[1] "Vor %d Tagen"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Heute"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Morgen"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "In %d Tag"
+msgstr[1] "In %d Tagen"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "Gewitter mit leichtem Regen"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "Gewitter mit Regen"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "Gewitter mit starkem Regen"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "leichte Gewitter"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "Gewitter"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "schwere Gewitter"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "einige Gewitter"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "Gewitter mit leichtem Nieselregen"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "Gewitter mit Nieselregen"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "Gewitter mit starkem Nieselregen"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "leichtes Nieseln"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "Nieseln"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "starkes Nieseln"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "leichter Nieselregen"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "Nieselregen"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "starker Nieselregen"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "Regenschauer und Nieseln"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "starke Regenschauer und Nieseln"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "Nieselschauer"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "leichter Regen"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "mäßiger Regen"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "sehr starker Regen"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "sehr starker Regen"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "Starkregen"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "Eisregen"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "leichte Regenschauer"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "Regenschauer"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "heftige Regenschauer"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "einige Regenschauer"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "mäßiger Schnee"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "Schnee"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "heftiger Schneefall"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "Graupel"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "Graupelschauer"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "leichter Regen und Schnee"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "Regen und Schnee"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "leichter Schneeschauer"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "Schneeschauer"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "heftiger Schneeschauer"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "trüb"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "Rauch"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "Dunst"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "Sand / Staubsturm"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "Nebel"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "Sand"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "Staub"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "Vulkanasche"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "Sturmböen"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "Tornado"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "klarer Himmel"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "ein paar Wolken"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "überwiegend bewölkt"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "überwiegend bewölkt"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "wolkenbedeckt"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Still"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Leichter Windzug"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Leichte Brise"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Schwache Brise"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr "Ungültige Daten beim Suchen nach \"%s\""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" nicht gefunden"
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Standort"
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Anbieter"
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Mäßige Brise"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Frische Brise"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Starker Wind"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Steifer Wind"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Stürmischer Wind"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Sturm"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Schwerer Sturm"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Orkanartiger Sturm"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Orkan"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Montag"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Freitag"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Samstag"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NO"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "O"
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SO"
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
-
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SW"
-
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "W"
-
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NW"
-
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Gestern"
-
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "Vor %s Tag(en)"
-
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Heute"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Morgen"
-
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "In %s Tagen"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Lade aktuelles Wetter ..."
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Enferne %s ?"
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Lade ..."
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "Standard"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Name bearbeiten"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "Inhalt löschen"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Koordinaten bearbeiten"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "Standard Wetterdienst der Erweiterung"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Speichern"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Nach Orten oder Koordinaten suchen"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "z.B. Vaiaku, Tuvalu oder -8.5211767,179.1976747"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Suchen"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Standard Wetteranbieter wählen"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Bitte warten"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Persönlicher Api Schlüssel von openweathermap.org"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Bewölkung"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Persönlicher Api Schlüssel von forecast.io"
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr "Auffrischintervall für das aktelle Wetter [min]"
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr "Auffrischintervall für die Vorhersage [min]"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Luftfeuchtigkeit:"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+"Hinweis: das Auffrischintervall für die Vorhersagedaten wird nicht für "
+"forecast.io benutzt, da keine getrennten Daten für Vorhersage und aktuelles "
+"Wetter angeboten werden."
+
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Den Api-Schlüssel der Erweiterung für openweathermap.org benutzen"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Luftdruck:"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
+"Ausschalten, falls sie einen persönlichen API-key für openweather.org "
+"benutzen wollen und diesen in das entsprechende Textfeld kopieren."
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Windgeschwindigkeit:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Wetteranbieter"
+
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr "Geolocation-Anbieter wählen"
+
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Persönlicher AppKey von developer.mapquest.com"
+
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr "Geolocation Anbieter"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatureinheit"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Windgeschwindigkeit"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Druckeinheit:"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Einheiten"
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Position im Panel"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Mitte"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Rechts"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Links"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Windrichtung durch Pfeile angeben"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Wetterdaten übersetzen"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Eigene Wettersymbole"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr "Text auf Buttons"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperaturanzeige"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Textanzeige im Panel"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Textanzeige in Vorhersage"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Vorhersage zentrieren"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Anzahl Tage in der Vorhersage"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Größtmögliche Anzahl von Nachkommastellen"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "Persönlicher Api Schlüssel von openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Mitte"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Name der Ortschaft"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Rechts"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Enferne %s ?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Links"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Oberfläche"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Version: "
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "unbekannt (selbst erstellt ?)"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>Wettererweiterung zur Anzeige von Wetterinformationen von <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> oder <a href=\"https://"
+"forecast.io\">forecast.io</a> für (fast) alle Orte auf der Erde.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Verwaltet von"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Internetseite"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">Dieses Programm kommt OHNE IRGENDEINE GARANTIE.\n"
+"Siehe the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, Version 2 oder neuer</a> für Einzelheiten.</"
+"span>"
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "Über"
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Lade aktuelles Wetter ..."
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/el.po gnome-shell-extension-weather-0~20151114.git609/po/el.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/el.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/el.po	2015-11-17 15:10:32.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2014-05-06 20:14+0200\n"
 "Last-Translator: poseidaon <poseidaon@users.noreply.github.com>\n"
 "Language-Team: \n"
@@ -17,498 +17,705 @@
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Το Σχήμα \"%s\" δε βρέθηκε"
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Αδύνατο το άνοιγμα %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Τοποθεσίες"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Επαναφόρτωση Πληροφοριών Καιρού"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Πάροχος πληροφοριών καιρού:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "Αδύνατο το άνοιγμα %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Ρυθμίσεις Καιρού"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Μη έγκυρη πόλη"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Ήρεμος"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Ελαφριά αύρα"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Ελαφρύ αεράκι"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Ήρεμο αεράκι"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Μέτριο αεράκι"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Δροσερό αεράκι"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Δυνατό αεράκι"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Μέτρια ανεμοθύελλα"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Δροσερή ανεμοθύελλα"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Δυνατή ανεμοθύελα"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Θύελλα"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Βίαιη θύελλα"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Τυφώνας"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Κυριακή"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Δευτέρα"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Τρίτη"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Τετάρτη"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Πέμπτη"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Παρασκευή"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Σάββατο"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "Β"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "ΒΑ"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "Α"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "ΝΑ"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "Ν"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "ΝΔ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "Δ"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "ΒΔ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Φόρτωση..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Παρακαλώ περιμένετε"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Συννεφιά:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Υγρασία:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Πίεση:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Άνεμος:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Εχθές"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "εδώ και %s μέρες"
+msgstr[1] "εδώ και %s μέρες"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Σήμερα"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Αύριο"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Σε %s μέρες"
+msgstr[1] "Σε %s μέρες"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "καταιγίδα με ελαφριά βροχή"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "καταιγίδα με βροχή"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "καταιγίδα με έντονη βροχόπτωση"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "ελαφριά καταιγίδα"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "καταιγίδα"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "έντονη καταιγίδα"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "ισχυρή καταιγίδα"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "καταιγίδα με ελαφρύ ψιχάλισμα"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "καταιγίδα με ψιχάλισμα"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "καταιγίδα με έντονο ψιχάλισμα"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "ελαφράς έντασης ψιχάλισμα"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "ψιχάλες"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "μεγάλης έντασης ψιχάλισμα"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "ελαφράς έντασης ψιλόβροχο"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "ψιλόβροχο"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "μεγάλης έντασης ψιλόβροχο"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "μπόρα με βροχή και ψιλόβροχο"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "έντονη μπόρα με βροχή και ψιλόβροχο"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "μπόρα με ψιλόβροχο"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "ελαφριά βροχή"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "μέτρια βροχή"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "μεγάλης έντασης βροχή"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "έντονη βροχόπτωση"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "ακραία βροχόπτωση"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "παγωμένη βροχή"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "ελαφράς έντασης μπόρα με βροχή"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "μπόρα με βροχή"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "μεγάλης έντασης μπόρα με βροχή"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "ισχυρή μπόρα με βροχή"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "ελαφριά χιονόπτωση"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "χιονόπτωση"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "έντονη χιονόπτωση"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "πάγος"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "παγωμένο χιόνι"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "ελαφριά βροχή και χιόνι"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "βροχή και χιόνι"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "ελαφριά χιονοθύελλα"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "χιονοθύελλα"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "έντονη χιονοθύελλα"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "ομίχλη"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "υδρατμοί"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "καταχνιά"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "Στρόβιλοι Άμμου/Σκόνης"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "Ομιχλώδης"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "άμμος"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "σκόνη"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "ΗΦΑΙΣΤΙΑΚΗ ΤΕΦΡΑ"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "ΜΠΟΥΡΙΝΙ"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "ΑΝΕΜΟΣΤΡΟΒΙΛΟΣ"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "καθαρός ουρανός"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "λίγα σύννεφα"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "σποραδικές νεφώσεις"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "διάσπαρτα σύννεφα"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "κυρίως νεφελώδης"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Μη διαθέσιμο"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Ήρεμος"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Ελαφριά αύρα"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Ελαφρύ αεράκι"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Ήρεμο αεράκι"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Μέτριο αεράκι"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Δροσερό αεράκι"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Δυνατό αεράκι"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Μέτρια ανεμοθύελλα"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Δροσερή ανεμοθύελλα"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Δυνατή ανεμοθύελα"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Θύελλα"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Βίαιη θύελλα"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Τυφώνας"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Κυριακή"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Το Σχήμα \"%s\" δε βρέθηκε"
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Δευτέρα"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Τοποθεσίες"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Τρίτη"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Τετάρτη"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Αφαίρεση %s ;"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Πέμπτη"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Παρασκευή"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Σάββατο"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Καθαρός"
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "Β"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "ΒΑ"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "Α"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "ΝΑ"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "Ν"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "ΝΔ"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "Δ"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "ΒΔ"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Εχθές"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Προσωπικό κλειδί Api από το openweathermap.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "εδώ και %s μέρες"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Προσωπικό κλειδί Api από το openweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Σήμερα"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Αύριο"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "Σε %s μέρες"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Φόρτωση τρέχουσας πρόγνωσης..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Φόρτωση..."
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Προσωπικό κλειδί Api από το openweathermap.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Παρακαλώ περιμένετε"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Συννεφιά:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Πάροχος πληροφοριών καιρού:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Υγρασία:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Πίεση:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Προσωπικό κλειδί Api από το openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Άνεμος:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Πάροχος πληροφοριών καιρού:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Μονάδα Θερμοκρασίας"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Μονάδα Ταχύτητας Ανέμου"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Μονάδα Πίεσης"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Θέση στον Πίνακα"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Κέντρο"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Δεξιά"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Αριστερά"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Κατεύθυνση Ανέμου με Βέλη"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Μετάφραση Καιρικών Συνθηκών"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Εικονίδια Συμβόλων"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Θερμοκρασία στον Πίνακα"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Συνθήκες στον πίνακα"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Συνθήκες στον πίνακα"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Πρόγνωση στο κέντρο"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Αριθμός ημερών πρόγνωσης"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Μέγιστος αριθμός ψηφίων μετά την υποδιαστολή"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "Προσωπικό κλειδί Api από το openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Κέντρο"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Όνομα πόλης"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Δεξιά"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Αφαίρεση %s ;"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Αριστερά"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Φόρτωση τρέχουσας πρόγνωσης..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "Σε %s μέρες"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "εδώ και %s μέρες"
+#~ msgstr[1] "εδώ και %s μέρες"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "εδώ και %s μέρες"
+#~ msgstr[1] "εδώ και %s μέρες"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "Σε %s μέρες"
+#~ msgstr[1] "Σε %s μέρες"
+
+#~ msgid "Name of the city"
+#~ msgstr "Όνομα πόλης"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Φόρτωση μελλοντικής πρόγνωσης..."
@@ -558,9 +765,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Μερικώς νεφελώδης"
 
-#~ msgid "Clear"
-#~ msgstr "Καθαρός"
-
 #~ msgid "Sunny"
 #~ msgstr "Ηλιόλουστος"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/es.po gnome-shell-extension-weather-0~20151114.git609/po/es.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/es.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/es.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:38+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: Español; Castellano <zodiac_es@yahoo.es>\n"
@@ -17,495 +17,698 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schema \"%s\" no encontrada."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "No se puede abrir %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Localidad"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Recargar información del Clima"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Información provista por:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "No se puede abrir %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Configuración del Clima"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Ciudad inválida"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "calmo"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "viento ligero"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "brisa suave"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "brisa moderada"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "brisa fresca"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "brisa fuerte"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "vendaval moderado"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "vendaval"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "vendaval fuerte"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "tormenta"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "huracán"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Lunes"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Martes"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Jueves"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Viernes"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NE"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "E"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SE"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NO"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Cargando..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Espere un momento"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Nubosidad:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Humedad:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Presión:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Viento:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Ayer"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "hace %s días"
+msgstr[1] "hace %s días"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Hoy"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "En %s días"
+msgstr[1] "En %s días"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "tormentas leves"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "tormentas"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "tormentas fuertes"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "tormentas leves"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "tormentas"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "tormentas severas"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "tormentas dispersas"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "tormentas y lloviznas leves"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "tormentas y lloviznas"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "tormentas y lloviznas severas"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "lloviznas leves"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "llovizna"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "lloviznas intensas"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "lloviznas leves"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "lloviznas"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "lloviznas intensas"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "aguaceros y lloviznas"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "aguaceros fuertes y lloviznas"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "lluvia con heladas"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "lluvia leve"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "lluvia moderada"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "lluvia intensa"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "lluvia severa"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "lluvia extrema"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "lluvia con heladas"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "aguaceros leves"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "aguaceros"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "aguaceros intensos"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "aguaceros dispersos"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "nevadas leves"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "nevadas"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "fuertes nevadas"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "aguanieve"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "lluvia y aguanieve"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "lluvias leves y nevadas"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "lluvias y nevadas"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "nevadas leves"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "nevadas"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "fuertes nevadas"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "niebla"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "humo"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "neblina"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "bruma"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "arena"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "polvo"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "cenizas volcánicas"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "tornado"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "despejado"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "algunas nubes"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "nubes aisladas"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "nubes dispersas"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "muy nublado"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "No disponible"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "calmo"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "viento ligero"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "brisa suave"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "brisa moderada"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "brisa fresca"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "brisa fuerte"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "vendaval moderado"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "vendaval"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "vendaval fuerte"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schema \"%s\" no encontrada."
 
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "tormenta"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Localidad"
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "huracán"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Domingo"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Lunes"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Martes"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Miércoles"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Jueves"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Viernes"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sábado"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NE"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "E"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SE"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SO"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "O"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NO"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Ayer"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "hace %s días"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Hoy"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Mañana"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "En %s días"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Cargando la meteorología actual..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Cargando..."
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Espere un momento"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Nubosidad:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Información provista por:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Humedad:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Presión:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Viento:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Información provista por:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatura:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Unidad Velocidad de Viento"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Unidad de Presión"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Posición en el Panel"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Centrado"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Derecha"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Izquierda"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Dirección de Viento por flechas"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Traducir Condiciones"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Iconos Simbólicos"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatura en el Panel"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Condiciones en el Panel"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Condiciones en el Panel"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Pronóstico Central"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Número de días del pronóstico"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Número de decimales"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centrado"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Derecha"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Izquierda"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Nombre de la ciudad"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
 msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Cargando la meteorología actual..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "En %s días"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "hace %s días"
+#~ msgstr[1] "hace %s días"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "hace %s días"
+#~ msgstr[1] "hace %s días"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "En %s días"
+#~ msgstr[1] "En %s días"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nombre de la ciudad"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/fi.po gnome-shell-extension-weather-0~20151114.git609/po/fi.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/fi.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/fi.po	2015-11-17 15:10:32.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-06-07 10:45+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: suomi <>\n"
@@ -19,523 +19,739 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Skeemaa \"%s\" ei löytynyt."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Päivitä säätiedot"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Sääasetukset"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Virheellinen kaupunki"
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Hurrikaani"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Maanantai"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Torstai"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Perjantai"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Launtai"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Ladataan..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Odota"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Kosteusprosentti:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Ilmanpaine:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Tuulen nopeus:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Eilen"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s päivää sitten"
+msgstr[1] "%s päivää sitten"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Tänään"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Huomenna"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "%s päivää sitten"
+msgstr[1] "%s päivää sitten"
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Ukkosmyrskyjä"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Ukkosmyrskyjä"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Ukkosmyrskyjä"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Yksittäisiä ukkosmyrskyjä"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Ukkosmyrskyjä"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Voimakkaita ukkosmyrskyjä"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Yksittäisiä ukkosmyrskyjä"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Ukkosmyrskyjä"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Ukkosmyrskyjä"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Ukkosmyrskyjä"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Tihkusadetta"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Puhreja ja viimaa"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Tihkusadetta"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Tihkusadetta"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Tihkusadetta"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Puhreja ja viimaa"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Puhreja ja viimaa"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Kylmä tihkusade"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Jäätävää sadetta"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Tihkusadetta"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Jäätävää sadetta"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Jäätävää sadetta"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Kevyttä lumisadetta"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Sadekuuroja"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Märkää lunta"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Lumipyry"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Märkää lunta"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Loskaa"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Sadekuuroja"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Räntäsade"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Räntäsade"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Kevyttä lumisadetta"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Sadekuuroja"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Märkää lunta"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Sumua"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Pilvipeite rakoilee"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Hajanaisia sateita"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Pilvipeite rakoilee"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Pilvipeite rakoilee"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Ei saatavilla"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr ""
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Skeemaa \"%s\" ei löytynyt."
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr ""
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Poistetaanko %s?"
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Selkeää"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Hurrikaani"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Sunnuntai"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Maanantai"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Tiistai"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Keskiviikko"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Torstai"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Perjantai"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Launtai"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Eilen"
-
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s päivää sitten"
-
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Tänään"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Huomenna"
-
-#: ../src/extension.js:1682
-#, fuzzy, python-format
-msgid "In %s days"
-msgstr "%s päivää sitten"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Ladataan säätietoja"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Ladataan..."
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Odota"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Kosteusprosentti:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Ilmanpaine:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Tuulen nopeus:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Lämpötila"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Tuulen nopeuden yksikkö"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Ilmanpaine:"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Sijainti paneelissa"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Keskellä"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Oikealla"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Vasemmalla"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Käännä olosuhteet"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Symboliset kuvakkeet"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Lämpötila"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Olosuhteet paneelissa"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Olosuhteet paneelissa"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Keskellä"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Oikealla"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Vasemmalla"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Kaupungin nimi"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Poistetaanko %s?"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Ladataan säätietoja"
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "%s päivää sitten"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s päivää sitten"
+#~ msgstr[1] "%s päivää sitten"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s päivää sitten"
+#~ msgstr[1] "%s päivää sitten"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "%s päivää sitten"
+#~ msgstr[1] "%s päivää sitten"
+
+#~ msgid "Name of the city"
+#~ msgstr "Kaupungin nimi"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Ladataan huomisen säätietoja"
@@ -585,9 +801,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Puolipilvistä"
 
-#~ msgid "Clear"
-#~ msgstr "Selkeää"
-
 #~ msgid "Sunny"
 #~ msgstr "Aurinko paistaa"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/fr.po gnome-shell-extension-weather-0~20151114.git609/po/fr.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/fr.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/fr.po	2015-11-17 15:10:32.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2014-05-09 21:57+0200\n"
 "Last-Translator: Christian METZLER (Neroth) <neroth@xeked.com>\n"
 "Language-Team: Français <ecyrbe@gmail.com>\n"
@@ -20,498 +20,705 @@
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schéma \"%s\" manquant."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Impossible d'ouvrir %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Emplacements"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Recharger les informations météo"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Données météo fournies par :"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Paramètres de la météo"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Ville invalide"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Calme"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Très légère brise"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Légère brise"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Petite brise"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Brise modérée"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Brise fraîche"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Forte brise"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Coup de vent"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Coup de vent frais"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Fort coup de vent"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Tempête"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Violente tempête"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Ouragan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Lundi"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Vendredi"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Samedi"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NE"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "E"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SE"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NO"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Chargement ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Patientez s'il vous plaît"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Nébulosité :"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Humidité :"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Pression :"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vent :"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Hier"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Il y a %s jours"
+msgstr[1] "Il y a %s jours"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Demain"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Dans %s jours"
+msgstr[1] "Dans %s jours"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "Orage avec pluie légère"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "Orage avec pluie"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "Orage avec de fortes pluies"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "Orages isolés"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "Orage"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "Orage sévère"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "Orages isolés"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "Orage avec bruine légère"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "Orage avec bruine"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "Orage avec forte bruine"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "Bruine légère"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "Bruine"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "Bruine forte"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "Bruine légère"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "Bruine"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "Pluie forte"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "Averses"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "Fortes averses"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "Bruine"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "Légère pluie"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "Pluie modérée"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "Pluie forte"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "Pluie très forte"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "Pluie extrêmement forte"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "Pluie verglaçante"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "Averses légères"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "Averses"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "Fortes averses"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "Averses isolées"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "Faibles chutes de neige"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "Neige"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "Fortes chutes de neige"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "Grésil"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "Grésil"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "Neige et pluie"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "Neige et pluie"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "Faibles averses de neige"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "Averses"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "Fortes chutes de neige"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "Brouillard"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "Brume"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "Brume"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "Tourbillons de sable/poussière"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "Brouillard"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "sable"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "poussière"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "CENDRES VOLCANIQUES"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "ORAGES"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "TORNADE"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "Ciel dégagé"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "Quelques nuages"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "Nuages épars"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "Nuages épars"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "Couvert"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Non disponible"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Calme"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Très légère brise"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Légère brise"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Petite brise"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Brise modérée"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Brise fraîche"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Forte brise"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Coup de vent"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Coup de vent frais"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Fort coup de vent"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Tempête"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Violente tempête"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Ouragan"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Dimanche"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schéma \"%s\" manquant."
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Lundi"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Emplacements"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Mardi"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Mercredi"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Supprimer %s ?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Jeudi"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Vendredi"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Samedi"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Dégagé"
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NE"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "E"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SE"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SO"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "O"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NO"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Hier"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Clé API personnelle de openweathermap.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "Il y a %s jours"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Clé API personnelle de openweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Aujourd'hui"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Demain"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "Dans %s jours"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Chargement de la météo ..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Chargement ..."
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Clé API personnelle de openweathermap.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Patientez s'il vous plaît"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Nébulosité :"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Données météo fournies par :"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Humidité :"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Pression :"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Clé API personnelle de openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vent :"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Données météo fournies par :"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Unité de température"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Unité de vitesse du vent"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Unité de pression"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Position sur le tableau de bord"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Centre"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Droite"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Gauche"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Direction du vent par des flèches"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Traduction des conditions"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Icones symboliques"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Température sur le tableau de bord"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Conditions sur le tableau de bord"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Conditions sur le tableau de bord"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Centrer la prévision"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Nombre de jours dans la prévision"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Nombre maximal de chiffres après la virgule"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "Clé API personnelle de openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centre"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Nom de la ville"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Droite"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Supprimer %s ?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Gauche"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Chargement de la météo ..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "Dans %s jours"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Il y a %s jours"
+#~ msgstr[1] "Il y a %s jours"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Il y a %s jours"
+#~ msgstr[1] "Il y a %s jours"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "Dans %s jours"
+#~ msgstr[1] "Dans %s jours"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nom de la ville"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Chargement des prévisions ..."
@@ -561,9 +768,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Passages nuageux"
 
-#~ msgid "Clear"
-#~ msgstr "Dégagé"
-
 #~ msgid "Sunny"
 #~ msgstr "Ensoleillé"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/gnome-shell-extension-openweather.pot gnome-shell-extension-weather-0~20151114.git609/po/gnome-shell-extension-openweather.pot
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/gnome-shell-extension-openweather.pot	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/gnome-shell-extension-openweather.pot	2015-11-17 15:10:32.000000000 +0000
@@ -0,0 +1,683 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../src/extension.js:172
+msgid "..."
+msgstr ""
+
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
+msgid "Locations"
+msgstr ""
+
+#: ../src/extension.js:788
+msgid "Reload Weather Information"
+msgstr ""
+
+#: ../src/extension.js:803
+msgid "Weather data provided by:"
+msgstr ""
+
+#: ../src/extension.js:814
+#, javascript-format
+msgid "Can not open %s"
+msgstr ""
+
+#: ../src/extension.js:821
+msgid "Weather Settings"
+msgstr ""
+
+#: ../src/extension.js:872 ../src/prefs.js:1021
+msgid "Invalid city"
+msgstr ""
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr ""
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr ""
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr ""
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr ""
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr ""
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr ""
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr ""
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/openweathermap_org.js:181
+msgid "thunderstorm with light rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:183
+msgid "thunderstorm with rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:185
+msgid "thunderstorm with heavy rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:187
+msgid "light thunderstorm"
+msgstr ""
+
+#: ../src/openweathermap_org.js:189
+msgid "thunderstorm"
+msgstr ""
+
+#: ../src/openweathermap_org.js:191
+msgid "heavy thunderstorm"
+msgstr ""
+
+#: ../src/openweathermap_org.js:193
+msgid "ragged thunderstorm"
+msgstr ""
+
+#: ../src/openweathermap_org.js:195
+msgid "thunderstorm with light drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:197
+msgid "thunderstorm with drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:199
+msgid "thunderstorm with heavy drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:201
+msgid "light intensity drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:203
+msgid "drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:205
+msgid "heavy intensity drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:207
+msgid "light intensity drizzle rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:209
+msgid "drizzle rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:211
+msgid "heavy intensity drizzle rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:213
+msgid "shower rain and drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:215
+msgid "heavy shower rain and drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:217
+msgid "shower drizzle"
+msgstr ""
+
+#: ../src/openweathermap_org.js:219
+msgid "light rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:221
+msgid "moderate rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:223
+msgid "heavy intensity rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:225
+msgid "very heavy rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:227
+msgid "extreme rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:229
+msgid "freezing rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:231
+msgid "light intensity shower rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:233
+msgid "shower rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:235
+msgid "heavy intensity shower rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:237
+msgid "ragged shower rain"
+msgstr ""
+
+#: ../src/openweathermap_org.js:239
+msgid "light snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:241
+msgid "snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:243
+msgid "heavy snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:245
+msgid "sleet"
+msgstr ""
+
+#: ../src/openweathermap_org.js:247
+msgid "shower sleet"
+msgstr ""
+
+#: ../src/openweathermap_org.js:249
+msgid "light rain and snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:251
+msgid "rain and snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:253
+msgid "light shower snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:255
+msgid "shower snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:257
+msgid "heavy shower snow"
+msgstr ""
+
+#: ../src/openweathermap_org.js:259
+msgid "mist"
+msgstr ""
+
+#: ../src/openweathermap_org.js:261
+msgid "smoke"
+msgstr ""
+
+#: ../src/openweathermap_org.js:263
+msgid "haze"
+msgstr ""
+
+#: ../src/openweathermap_org.js:265
+msgid "Sand/Dust Whirls"
+msgstr ""
+
+#: ../src/openweathermap_org.js:267
+msgid "Fog"
+msgstr ""
+
+#: ../src/openweathermap_org.js:269
+msgid "sand"
+msgstr ""
+
+#: ../src/openweathermap_org.js:271
+msgid "dust"
+msgstr ""
+
+#: ../src/openweathermap_org.js:273
+msgid "VOLCANIC ASH"
+msgstr ""
+
+#: ../src/openweathermap_org.js:275
+msgid "SQUALLS"
+msgstr ""
+
+#: ../src/openweathermap_org.js:277
+msgid "TORNADO"
+msgstr ""
+
+#: ../src/openweathermap_org.js:279
+msgid "sky is clear"
+msgstr ""
+
+#: ../src/openweathermap_org.js:281
+msgid "few clouds"
+msgstr ""
+
+#: ../src/openweathermap_org.js:283
+msgid "scattered clouds"
+msgstr ""
+
+#: ../src/openweathermap_org.js:285
+msgid "broken clouds"
+msgstr ""
+
+#: ../src/openweathermap_org.js:287
+msgid "overcast clouds"
+msgstr ""
+
+#: ../src/openweathermap_org.js:289
+msgid "Not available"
+msgstr ""
+
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr ""
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr ""
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
+
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr ""
+
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr ""
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
+
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr ""
+
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr ""
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
+
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
+
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
+
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr ""
+
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
+
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
+
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
+
+#: ../data/weather-settings.ui:751
+msgid "Temperature Unit"
+msgstr ""
+
+#: ../data/weather-settings.ui:762
+msgid "Wind Speed Unit"
+msgstr ""
+
+#: ../data/weather-settings.ui:773
+msgid "Pressure Unit"
+msgstr ""
+
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr ""
+
+#: ../data/weather-settings.ui:880
+msgid "Wind Direction by Arrows"
+msgstr ""
+
+#: ../data/weather-settings.ui:891
+msgid "Translate Conditions"
+msgstr ""
+
+#: ../data/weather-settings.ui:902
+msgid "Symbolic Icons"
+msgstr ""
+
+#: ../data/weather-settings.ui:913
+msgid "Text on buttons"
+msgstr ""
+
+#: ../data/weather-settings.ui:924
+msgid "Temperature in Panel"
+msgstr ""
+
+#: ../data/weather-settings.ui:935
+msgid "Conditions in Panel"
+msgstr ""
+
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:957
+msgid "Center forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:968
+msgid "Number of days in forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:979
+msgid "Maximal number of digits after the decimal point"
+msgstr ""
+
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr ""
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr ""
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr ""
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/gnome-shell-extension-weather.pot gnome-shell-extension-weather-0~20151114.git609/po/gnome-shell-extension-weather.pot
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/gnome-shell-extension-weather.pot	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/gnome-shell-extension-weather.pot	1970-01-01 00:00:00.000000000 +0000
@@ -1,502 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-07 07:54+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/extension.js:139
-msgid "..."
-msgstr ""
-
-#: ../src/extension.js:236
-msgid "Weather data provided by:   "
-msgstr ""
-
-#: ../src/extension.js:256
-msgid "Locations"
-msgstr ""
-
-#: ../src/extension.js:260
-msgid "Reload Weather Information"
-msgstr ""
-
-#: ../src/extension.js:267
-msgid "Weather Settings"
-msgstr ""
-
-#: ../src/extension.js:320
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr ""
-
-#: ../src/extension.js:642 ../src/extension.js:651 ../src/prefs.js:813
-msgid "Invalid city"
-msgstr ""
-
-#: ../src/extension.js:879
-msgid "thunderstorm with light rain"
-msgstr ""
-
-#: ../src/extension.js:881
-msgid "thunderstorm with rain"
-msgstr ""
-
-#: ../src/extension.js:883
-msgid "thunderstorm with heavy rain"
-msgstr ""
-
-#: ../src/extension.js:885
-msgid "light thunderstorm"
-msgstr ""
-
-#: ../src/extension.js:887
-msgid "thunderstorm"
-msgstr ""
-
-#: ../src/extension.js:889
-msgid "heavy thunderstorm"
-msgstr ""
-
-#: ../src/extension.js:891
-msgid "ragged thunderstorm"
-msgstr ""
-
-#: ../src/extension.js:893
-msgid "thunderstorm with light drizzle"
-msgstr ""
-
-#: ../src/extension.js:895
-msgid "thunderstorm with drizzle"
-msgstr ""
-
-#: ../src/extension.js:897
-msgid "thunderstorm with heavy drizzle"
-msgstr ""
-
-#: ../src/extension.js:899
-msgid "light intensity drizzle"
-msgstr ""
-
-#: ../src/extension.js:901
-msgid "drizzle"
-msgstr ""
-
-#: ../src/extension.js:903
-msgid "heavy intensity drizzle"
-msgstr ""
-
-#: ../src/extension.js:905
-msgid "light intensity drizzle rain"
-msgstr ""
-
-#: ../src/extension.js:907
-msgid "drizzle rain"
-msgstr ""
-
-#: ../src/extension.js:909
-msgid "heavy intensity drizzle rain"
-msgstr ""
-
-#: ../src/extension.js:911
-msgid "shower rain and drizzle"
-msgstr ""
-
-#: ../src/extension.js:913
-msgid "heavy shower rain and drizzle"
-msgstr ""
-
-#: ../src/extension.js:915
-msgid "shower drizzle"
-msgstr ""
-
-#: ../src/extension.js:917
-msgid "light rain"
-msgstr ""
-
-#: ../src/extension.js:919
-msgid "moderate rain"
-msgstr ""
-
-#: ../src/extension.js:921
-msgid "heavy intensity rain"
-msgstr ""
-
-#: ../src/extension.js:923
-msgid "very heavy rain"
-msgstr ""
-
-#: ../src/extension.js:925
-msgid "extreme rain"
-msgstr ""
-
-#: ../src/extension.js:927
-msgid "freezing rain"
-msgstr ""
-
-#: ../src/extension.js:929
-msgid "light intensity shower rain"
-msgstr ""
-
-#: ../src/extension.js:931
-msgid "shower rain"
-msgstr ""
-
-#: ../src/extension.js:933
-msgid "heavy intensity shower rain"
-msgstr ""
-
-#: ../src/extension.js:935
-msgid "ragged shower rain"
-msgstr ""
-
-#: ../src/extension.js:937
-msgid "light snow"
-msgstr ""
-
-#: ../src/extension.js:939
-msgid "snow"
-msgstr ""
-
-#: ../src/extension.js:941
-msgid "heavy snow"
-msgstr ""
-
-#: ../src/extension.js:943
-msgid "sleet"
-msgstr ""
-
-#: ../src/extension.js:945
-msgid "shower sleet"
-msgstr ""
-
-#: ../src/extension.js:947
-msgid "light rain and snow"
-msgstr ""
-
-#: ../src/extension.js:949
-msgid "rain and snow"
-msgstr ""
-
-#: ../src/extension.js:951
-msgid "light shower snow"
-msgstr ""
-
-#: ../src/extension.js:953
-msgid "shower snow"
-msgstr ""
-
-#: ../src/extension.js:955
-msgid "heavy shower snow"
-msgstr ""
-
-#: ../src/extension.js:957
-msgid "mist"
-msgstr ""
-
-#: ../src/extension.js:959
-msgid "smoke"
-msgstr ""
-
-#: ../src/extension.js:961
-msgid "haze"
-msgstr ""
-
-#: ../src/extension.js:963
-msgid "Sand/Dust Whirls"
-msgstr ""
-
-#: ../src/extension.js:965
-msgid "Fog"
-msgstr ""
-
-#: ../src/extension.js:967
-msgid "sand"
-msgstr ""
-
-#: ../src/extension.js:969
-msgid "dust"
-msgstr ""
-
-#: ../src/extension.js:971
-msgid "VOLCANIC ASH"
-msgstr ""
-
-#: ../src/extension.js:973
-msgid "SQUALLS"
-msgstr ""
-
-#: ../src/extension.js:975
-msgid "TORNADO"
-msgstr ""
-
-#: ../src/extension.js:977
-msgid "sky is clear"
-msgstr ""
-
-#: ../src/extension.js:979
-msgid "few clouds"
-msgstr ""
-
-#: ../src/extension.js:981
-msgid "scattered clouds"
-msgstr ""
-
-#: ../src/extension.js:983
-msgid "broken clouds"
-msgstr ""
-
-#: ../src/extension.js:985
-msgid "overcast clouds"
-msgstr ""
-
-#: ../src/extension.js:987
-msgid "Not available"
-msgstr ""
-
-#: ../src/extension.js:1025
-msgid "Calm"
-msgstr ""
-
-#: ../src/extension.js:1028
-msgid "Light air"
-msgstr ""
-
-#: ../src/extension.js:1031
-msgid "Light breeze"
-msgstr ""
-
-#: ../src/extension.js:1034
-msgid "Gentle breeze"
-msgstr ""
-
-#: ../src/extension.js:1037
-msgid "Moderate breeze"
-msgstr ""
-
-#: ../src/extension.js:1040
-msgid "Fresh breeze"
-msgstr ""
-
-#: ../src/extension.js:1043
-msgid "Strong breeze"
-msgstr ""
-
-#: ../src/extension.js:1046
-msgid "Moderate gale"
-msgstr ""
-
-#: ../src/extension.js:1049
-msgid "Fresh gale"
-msgstr ""
-
-#: ../src/extension.js:1052
-msgid "Strong gale"
-msgstr ""
-
-#: ../src/extension.js:1055
-msgid "Storm"
-msgstr ""
-
-#: ../src/extension.js:1058
-msgid "Violent storm"
-msgstr ""
-
-#: ../src/extension.js:1061
-msgid "Hurricane"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Sunday"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Monday"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Tuesday"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Wednesday"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Thursday"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Friday"
-msgstr ""
-
-#: ../src/extension.js:1065
-msgid "Saturday"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "N"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "NE"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "E"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "SE"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "S"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "SW"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "W"
-msgstr ""
-
-#: ../src/extension.js:1071
-msgid "NW"
-msgstr ""
-
-#: ../src/extension.js:1285 ../src/extension.js:1465
-msgid "Yesterday"
-msgstr ""
-
-#: ../src/extension.js:1287 ../src/extension.js:1467
-#, python-format
-msgid "%s days ago"
-msgstr ""
-
-#: ../src/extension.js:1459
-msgid "Today"
-msgstr ""
-
-#: ../src/extension.js:1461
-msgid "Tomorrow"
-msgstr ""
-
-#: ../src/extension.js:1463
-#, python-format
-msgid "In %s days"
-msgstr ""
-
-#: ../src/extension.js:1527
-msgid "Loading current weather ..."
-msgstr ""
-
-#: ../src/extension.js:1530
-msgid "Loading future weather ..."
-msgstr ""
-
-#: ../src/extension.js:1564
-msgid "Loading ..."
-msgstr ""
-
-#: ../src/extension.js:1568
-msgid "Please wait"
-msgstr ""
-
-#: ../src/extension.js:1629
-msgid "Cloudiness:"
-msgstr ""
-
-#: ../src/extension.js:1633
-msgid "Humidity:"
-msgstr ""
-
-#: ../src/extension.js:1637
-msgid "Pressure:"
-msgstr ""
-
-#: ../src/extension.js:1641
-msgid "Wind:"
-msgstr ""
-
-#: ../src/prefs.js:125
-msgid "Temperature Unit"
-msgstr ""
-
-#: ../src/prefs.js:127
-msgid "Wind Speed Unit"
-msgstr ""
-
-#: ../src/prefs.js:129
-msgid "Pressure Unit"
-msgstr ""
-
-#: ../src/prefs.js:131
-msgid "Position in Panel"
-msgstr ""
-
-#: ../src/prefs.js:132
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:132
-msgid "Right"
-msgstr ""
-
-#: ../src/prefs.js:132
-msgid "Left"
-msgstr ""
-
-#: ../src/prefs.js:133
-msgid "Wind Direction by Arrows"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Translate Conditions"
-msgstr ""
-
-#: ../src/prefs.js:137
-msgid "Symbolic Icons"
-msgstr ""
-
-#: ../src/prefs.js:139
-msgid "Temperature in Panel"
-msgstr ""
-
-#: ../src/prefs.js:141
-msgid "Conditions in Panel"
-msgstr ""
-
-#: ../src/prefs.js:143
-msgid "Center forecast"
-msgstr ""
-
-#: ../src/prefs.js:145
-msgid "Number of days in forecast"
-msgstr ""
-
-#: ../src/prefs.js:147
-msgid "Personal Api key from openweathermap.org"
-msgstr ""
-
-#: ../src/prefs.js:300
-msgid "Name of the city"
-msgstr ""
-
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr ""
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/he.po gnome-shell-extension-weather-0~20151114.git609/po/he.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/he.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/he.po	2015-11-17 15:10:32.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2014-04-24 01:37+0300\n"
 "Last-Translator: Matanya Moses <matanya@foss.co.il>\n"
 "Language-Team: עברית <>\n"
@@ -19,504 +19,721 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "סכמה \"%s\" לא נמצאה."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "אין אפשרות לפתוח את %s"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "מקומות"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "טעינה מחדש"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "המידע מ:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "אין אפשרות לפתוח את %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "הגדרות"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "עיר שגויה"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "שקט"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "נשיבה קלה"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "רוח חרישית"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "רוח קלה"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "רוח מתונה"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "רוח ערה"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "רוח עזה"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "רוח סוערת"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "סער"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "סער עז"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "סופה"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "סופה עזה"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "הוריקן"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "יום א"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "יום ב"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "יום ג"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "יום ד"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "יום ה"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "יום ו"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "שבת"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "צפון"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "צפון מזרח"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "מזרח"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "דרום מזרח"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "דרום"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "דרום מערב"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "מערב"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "צפון מערב"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "טוען..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "נא להמתין"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "עננות:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "לחות:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "לחץ ברומטרי:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "רוח:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "אתמול"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "לפני %s ימים"
+msgstr[1] "לפני %s ימים"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "היום"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "מחר"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "בעוד %s ימים"
+msgstr[1] "בעוד %s ימים"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "סופות רעמים וגשם קל"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "סופות רעמים וגשם"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "סופות רעמים וגשם כבד"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "סופות רעמים קלות"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "סופות רעמים"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "סופות רעמים כבדות"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "סופות רעמים יחידות"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "סופות רעמים וטפטוף קל"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "סופות רעמים וטפטוף"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "סופות רעמים וטפטוף"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "טפטוף"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "טפטוף"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "טפטוף"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "טפטוף"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
+#, fuzzy
 msgid "shower rain and drizzle"
-msgstr ""
+msgstr "גשם ושלג מימי"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr ""
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
+#, fuzzy
 msgid "shower drizzle"
-msgstr ""
+msgstr "טפטוף"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "גשם קל"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "רוח סוערת"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "גשם כבד מאוד"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
+#, fuzzy
 msgid "extreme rain"
-msgstr ""
+msgstr "גשם קפוא"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "גשם קפוא"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr ""
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr ""
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr ""
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "שלג קל"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "שלג"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "שלג כבד"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "שלג מימי"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr ""
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "גשם קל מעורב בשלג"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "גשם מעורב בשלג"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
+#, fuzzy
 msgid "light shower snow"
-msgstr ""
+msgstr "שלג קל"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
+#, fuzzy
 msgid "shower snow"
-msgstr ""
+msgstr "שלג כבד"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
+#, fuzzy
 msgid "heavy shower snow"
-msgstr ""
+msgstr "שלג כבד"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "לחות"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "עשן"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "אובך"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "עלעול חול/אבק"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "ערפל"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "חול"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "אבק"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "אפר וולקני"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "תזזית"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "טורנדו"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "שמים נקיים"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "עננים בודדים"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "מעונן חלקית"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "מעונן"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "עננות כבדה"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "לא זמין"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "שקט"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "נשיבה קלה"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "רוח חרישית"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "רוח קלה"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "רוח מתונה"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "רוח ערה"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "רוח עזה"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "רוח סוערת"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "סער"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "סער עז"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "סופה"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "סופה עזה"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "הוריקן"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "יום א"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "סכמה \"%s\" לא נמצאה."
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "יום ב"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "מקומות"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "יום ג"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "יום ד"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "הסרת %s ?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "יום ה"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "יום ו"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "שבת"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "בהיר"
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "צפון"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "צפון מזרח"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "מזרח"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "דרום מזרח"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "דרום"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "דרום מערב"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "מערב"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "צפון מערב"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "אתמול"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "מפתח ממשק תכנות יישומים (API) אישי מopenweathermap.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "לפני %s ימים"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "מפתח ממשק תכנות יישומים (API) אישי מopenweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "היום"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "מחר"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "בעוד %s ימים"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "טוען מזג אויר עכשווי..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "טוען..."
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "מפתח ממשק תכנות יישומים (API) אישי מopenweathermap.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "נא להמתין"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "עננות:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "המידע מ:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "לחות:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "לחץ ברומטרי:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "מפתח ממשק תכנות יישומים (API) אישי מopenweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "רוח:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "המידע מ:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "יחידת טמפרטורה"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "יחידת מהירות הרוח"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "יחידת לחץ ברומטרי"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "מיקום בסרגל"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "מרכז"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "ימין"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "שמאל"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "כיוון האוויר בחיצים"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "תרגום מצב מזג האוויר"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "סמליל מייצג"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "הצגת טמפרטורה בסרגל"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "הצגת מזג האוויר בסרגל"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "הצגת מזג האוויר בסרגל"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "מרכוז התחזית"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "מספר הימים בתחזית"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "מספר מרבי של ספרות אחרי הנקודה העשרונית"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "מפתח ממשק תכנות יישומים (API) אישי מopenweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "מרכז"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "שם העיר"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "ימין"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "הסרת %s ?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "שמאל"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "טוען מזג אויר עכשווי..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "בעוד %s ימים"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "לפני %s ימים"
+#~ msgstr[1] "לפני %s ימים"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "לפני %s ימים"
+#~ msgstr[1] "לפני %s ימים"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "בעוד %s ימים"
+#~ msgstr[1] "בעוד %s ימים"
+
+#~ msgid "Name of the city"
+#~ msgstr "שם העיר"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "טוען מזג אויר עתידי..."
@@ -527,9 +744,6 @@
 #~ msgid "Tropical storm"
 #~ msgstr "סופה טרופית"
 
-#~ msgid "Mixed rain and sleet"
-#~ msgstr "גשם ושלג מימי"
-
 #~ msgid "Mixed snow and sleet"
 #~ msgstr "שלג מימי בחלקו"
 
@@ -566,9 +780,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "מעונן חלקית"
 
-#~ msgid "Clear"
-#~ msgstr "בהיר"
-
 #~ msgid "Sunny"
 #~ msgstr "שמשי"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/hu.po gnome-shell-extension-weather-0~20151114.git609/po/hu.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/hu.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/hu.po	2015-11-17 15:10:32.000000000 +0000
@@ -1,620 +1,726 @@
-# Hungarian translations for Neroth-gnome-shell-extension-openweather package.
-# Copyright (C) 2013 THE Neroth-gnome-shell-extension-openweather'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Neroth-gnome-shell-extension-openweather package.
-# Bojtos Péter <ptr@ulx.hu>, 2013.
+# Hungarian translation for gnome-shell-extension-openweather package.
+# Copyright (C) 2014.
+# This file is distributed under the same license as the package.
+# Zoltán Riba <riba.zoltan@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Neroth-gnome-shell-extension-weather 3696468\n"
+"Project-Id-Version: gnome-shell-extension-openweather\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
-"PO-Revision-Date: 2013-01-18 15:07+0100\n"
-"Last-Translator: Bojtos Péter <ptr@ulx.hu>\n"
-"Language-Team: Hungarian\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-08-15 16:39+0200\n"
+"Last-Translator: Zoltan Riba <riba.zoltan@gmail.com>\n"
+"Language-Team: \n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "\"%s\" minta nem található."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Nem lehet megnyitni %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Helyszínek"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Meteorológiai információ újratöltése"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr ""
+msgstr "Meteorológiai adatok szolgáltatója:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr ""
+msgstr "Nem lehet megnyitni %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Meteorológiai beállítások"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Érvénytelen város"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "Érvénytelen helyszín! Próbálja újra létrehozni."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Szélcsend"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Enyhe légmozgás"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Könnyű szellő"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Gyenge szél"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Mérsékelt szél "
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Élénk szél "
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Erős szél"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Metsző szél"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Viharos szél"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Vihar"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Vihar"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Heves vihar"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Hurrikán"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "vasárnap"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "hétfő"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "kedd"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "szerda"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "csütörtök"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "péntek"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "szombat"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "É"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "ÉK"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "K"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "DK"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "D"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "DNY"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "NY"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "ÉNY"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Betöltés ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Kérem várjon"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Felhőzöttség:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Páratartalom"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Légnyomás:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Szélerősség:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Tegnap"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s nappal ezelőtt"
+msgstr[1] "%s nappal ezelőtt"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "ma"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "holnap"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "%s napban"
+msgstr[1] "%s napban"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
-msgstr ""
+msgstr "zivatar gyenge esővel"
 
-#: ../src/extension.js:1083
-#, fuzzy
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
-msgstr "Zivatar"
+msgstr "zivatar esővel"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "zivatar záporesővel"
 
-#: ../src/extension.js:1087
-#, fuzzy
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
-msgstr "Elszigetelt viharok"
+msgstr "gyenge zivatar"
 
-#: ../src/extension.js:1089
-#, fuzzy
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
-msgstr "Zivatar"
+msgstr "zivatar"
 
-#: ../src/extension.js:1091
-#, fuzzy
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
-msgstr "Erős zivatar"
+msgstr "erős zivatar"
 
-#: ../src/extension.js:1093
-#, fuzzy
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
-msgstr "Elszigetelt viharok"
+msgstr "felhőszakadás"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "zivatar gyenge szitálással"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "zivatar szitálással"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "zivatar erős szitálással"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "gyenge szitálás"
 
-#: ../src/extension.js:1103
-#, fuzzy
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
-msgstr "Szitáló eső"
+msgstr "szitálás"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "erős szitálás"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "gyengén szitáló eső"
 
-#: ../src/extension.js:1109
-#, fuzzy
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
-msgstr "Szitáló eső"
+msgstr "szitáló eső"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "erősen szitáló eső"
 
-#: ../src/extension.js:1113
-#, fuzzy
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
-msgstr "Eső és jégeső"
+msgstr "záporeső és szitálás"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "záporeső és szitálás"
 
-#: ../src/extension.js:1117
-#, fuzzy
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
-msgstr "Fagyos szitáló eső"
+msgstr "záporos szitálás"
 
-#: ../src/extension.js:1119
-#, fuzzy
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
-msgstr "Tiszta levegő"
+msgstr "csendes eső"
 
-#: ../src/extension.js:1121
-#, fuzzy
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
-msgstr "Mérsékelt viharos szél"
+msgstr "mérsékelt eső"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
-msgstr ""
+msgstr "erős zápor"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
-msgstr ""
+msgstr "nagyon erős zápor"
 
-#: ../src/extension.js:1127
-#, fuzzy
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
-msgstr "Fagyos eső"
+msgstr "extrém zápor"
 
-#: ../src/extension.js:1129
-#, fuzzy
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
-msgstr "Fagyos eső"
+msgstr "fagyos eső"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "gyenge záporeső"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
-msgstr ""
+msgstr "záporeső"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "erős záporeső"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
-msgstr ""
+msgstr "tomboló záporeső"
 
-#: ../src/extension.js:1139
-#, fuzzy
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
-msgstr "Hóátfúvás"
+msgstr "gyenge havazás"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
-msgstr ""
+msgstr "havazás"
 
-#: ../src/extension.js:1143
-#, fuzzy
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
-msgstr "Erős hóesés"
+msgstr "erős havazás"
 
-#: ../src/extension.js:1145
-#, fuzzy
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
-msgstr "Ónos eső"
+msgstr "ónos eső"
 
-#: ../src/extension.js:1147
-#, fuzzy
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
-msgstr "Zápor"
+msgstr "ónos zápor"
 
-#: ../src/extension.js:1149
-#, fuzzy
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
-msgstr "Havas eső"
+msgstr "csendes havas eső"
 
-#: ../src/extension.js:1151
-#, fuzzy
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
-msgstr "Havas eső"
+msgstr "havas eső"
 
-#: ../src/extension.js:1153
-#, fuzzy
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
-msgstr "Könnyű havas zápor"
+msgstr "hószállingózás"
 
-#: ../src/extension.js:1155
-#, fuzzy
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
-msgstr "Zápor"
+msgstr "havazás"
 
-#: ../src/extension.js:1157
-#, fuzzy
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
-msgstr "Erős hóesés"
+msgstr "hózápor"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
-msgstr ""
+msgstr "köd"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
-msgstr ""
+msgstr "füst"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
-msgstr ""
+msgstr "pára"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
-msgstr ""
+msgstr "Homok/por örvények"
 
-#: ../src/extension.js:1167
-#, fuzzy
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
-msgstr "Ködös"
+msgstr "Köd"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
-msgstr ""
+msgstr "homok"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
-msgstr ""
+msgstr "por"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
-msgstr ""
+msgstr "VULKÁNI HAMU"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
-msgstr ""
+msgstr "SZÉLVIHAR"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
-msgstr ""
+msgstr "TORNÁDÓ"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
-msgstr ""
+msgstr "tiszta ég"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr ""
+msgstr "kevés felhő"
 
-#: ../src/extension.js:1183
-#, fuzzy
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
-msgstr "Szórványos zápor"
+msgstr "elszórtan felhős "
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
-msgstr ""
+msgstr "szakadozott felhőzet"
 
-#: ../src/extension.js:1187
-#, fuzzy
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
-msgstr "Jobbára felhős"
+msgstr "borult ég"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
-msgstr "Nem elérhető"
-
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Szélcsend"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Tiszta levegő"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Könnyű szellő"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Gyenge fuvallat"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Mérsékelt szellő"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Frissítő szellő"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Erős szél"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Mérsékelt viharos szél"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Frissítő viharos szél"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Erős viharos szél"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Vihar"
+msgstr "Nem érhető el"
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Heves vihar"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Hurrikán"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Vasárnap"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Hétfő"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Kedd"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Szerda"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Csütörtök"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Péntek"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Szombat"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "É"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "ÉK"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "K"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "DK"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" nem található"
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "D"
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Helyszín"
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "DNY"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Szolgáltató"
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "NY"
-
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "ÉNY"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "%s eltávolítása?"
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Tegnap"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "alapértelmezett"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Név szerkesztése"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "Bejegyzés törlése"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Koordináták szerkesztése"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "A kiterjesztés alapértelmezett meteorológiai szolgáltatója"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Mentés"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Keresés helyszínek vagy koordináták szerint"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "pl.: Vaiaku, Tuvalu or -8.5211767,179.1976747"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Keresés"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Alapértelmezett meteorológiai szolgáltató választás"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s nappal ezelőtt"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Személyes API kulcs az openweathermap.org weboldaltól"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Ma"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Személyes API kulcs a forecast.io weboldaltól"
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Holnap"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "%s napban"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Aktuális időjárás betöltése"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Betöltés ..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Kérem várjon"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Személyes API kulcs az openweathermap.org weboldaltól"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Páratartalom:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Meteorológiai adat szolgáltató"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Légnyomás:"
+#: ../data/weather-settings.ui:676
+#, fuzzy
+msgid "Chose geolocation provider"
+msgstr "Alapértelmezett meteorológiai szolgáltató választás"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Szél:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Személyes API kulcs a forecast.io weboldaltól"
+
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Meteorológiai adat szolgáltató"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Hőmérsékleti egység"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Szélerősség egység"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Nyomás egysége"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
-msgstr "Helyzete a panelen"
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Mértékegységek"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Középen"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Jobb"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Bal"
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Elhelyezkedés a panelen"
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Szélirány nyilakkal"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Fordítási feltételek"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
-msgstr "Jelképes Ikonok"
+msgstr "Jelképes ikonok"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
-msgstr ""
+msgstr "Felirat a gombokon"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Hőmérséklet a panelen"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Körülmények a panelen"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Körülmények az előrejelzésben"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr ""
+msgstr "Középtávú előrejelzés"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
-msgstr ""
+msgstr "Előrejelzett napok száma"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
-msgstr ""
-
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr ""
-
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Város neve"
-
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "%s eltávolítása?"
-
-#~ msgid "Loading future weather ..."
-#~ msgstr "Időjárás előrejelzés betöltése ..."
-
-#~ msgid "Tornado"
-#~ msgstr "Tornádó"
-
-#~ msgid "Tropical storm"
-#~ msgstr "Trópusi vihar"
-
-#~ msgid "Mixed rain and sleet"
-#~ msgstr "Ónos eső"
-
-#~ msgid "Mixed snow and sleet"
-#~ msgstr "Ónos eső és dara"
+msgstr "Tizedespont után álló számjegyek száma"
 
-#~ msgid "Snow flurries"
-#~ msgstr "Hózápor"
-
-#~ msgid "Snow"
-#~ msgstr "Havazás"
-
-#~ msgid "Hail"
-#~ msgstr "Zápor"
-
-#~ msgid "Dust"
-#~ msgstr "Por"
-
-#~ msgid "Haze"
-#~ msgstr "Pára"
-
-#~ msgid "Smoky"
-#~ msgstr "Ködös"
-
-#~ msgid "Blustery"
-#~ msgstr "Enyhén szeles"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "középen"
 
-#~ msgid "Windy"
-#~ msgstr "Szeles"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "jobbra"
 
-#~ msgid "Cold"
-#~ msgstr "Fagy"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "balra"
 
-#~ msgid "Cloudy"
-#~ msgstr "Felhős"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Elrendezés"
 
-#~ msgid "Partly cloudy"
-#~ msgstr "Részben felhős"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Verzió:"
 
-#~ msgid "Clear"
-#~ msgstr "Tiszta"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "ismeretlen (saját építés ?)"
 
-#~ msgid "Sunny"
-#~ msgstr "Napos"
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>A meteorológiai kiterjesztés időjárási információkat jelenít meg az <a "
+"href=\"https://openweathermap.org/\">Openweathermap</a> vagy a <a href="
+"\"https://forecast.io\">forecast.io</a> szolgáltatóktól a világ csaknem "
+"összes helyszínére.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Karbantartja"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Honlap"
 
-#~ msgid "Fair"
-#~ msgstr "Derült"
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">Ez a program SEMMILYEN GARANCIÁVAL NEM RENDELKEZIK.\n"
+"Tekintse meg <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, 2. vagy későbbi változatát</a> a részletekért."
+"</span>"
 
-#~ msgid "Hot"
-#~ msgstr "Forró"
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "A programról"
 
-#~ msgid "Scattered thunderstorms"
-#~ msgstr "Szórványos viharok"
+#~ msgid "Loading current weather ..."
+#~ msgstr "Aktuális időjárás betöltése ..."
 
 #, fuzzy
-#~ msgid "Isolated showers"
-#~ msgstr "Elszigetelt felhőszakadás"
+#~ msgid "In %d days"
+#~ msgstr "%s nap múlva"
 
-#~ msgid "Scattered snow showers"
-#~ msgstr "Szórványos hózápor"
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s nappal ezelőtt"
+#~ msgstr[1] "%s nappal ezelőtt"
 
-#~ msgid "Thundershowers"
-#~ msgstr "Felhőszakadás"
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s nappal ezelőtt"
+#~ msgstr[1] "%s nappal ezelőtt"
 
-#~ msgid "Snow showers"
-#~ msgstr "Hózápor"
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "%s nap múlva"
+#~ msgstr[1] "%s nap múlva"
 
-#~ msgid "Isolated thundershowers"
-#~ msgstr "Elszigetelt felhőszakadás"
+#~ msgid "Loading future weather ..."
+#~ msgstr "Időjárás előrejelzés betöltése ..."
 
-#, fuzzy
-#~ msgid "Feels like:"
-#~ msgstr "Hőérzet:"
+#~ msgid "Name of the city"
+#~ msgstr "Város neve"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/id.po gnome-shell-extension-weather-0~20151114.git609/po/id.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/id.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/id.po	2015-11-17 15:10:32.000000000 +0000
@@ -0,0 +1,694 @@
+# Indonesian translation for gnome-shell-extension-openweather
+# Copyright (C) 2011-2015
+# This file is distributed under the same license as the gnome-shell-extension-openweather package.
+# Andria Arisal <andria.arisal@gmail.com>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-10-14 12:10+0200\n"
+"Last-Translator: Andria Arisal <andria.arisal@gmail.com>\n"
+"Language-Team: Indonesian <>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+#: ../src/extension.js:172
+msgid "..."
+msgstr "..."
+
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr "Tidak dapat terhubung dengan %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
+msgid "Locations"
+msgstr "Lokasi"
+
+#: ../src/extension.js:788
+msgid "Reload Weather Information"
+msgstr "Perbarui informasi cuaca"
+
+#: ../src/extension.js:803
+msgid "Weather data provided by:"
+msgstr "Data cuaca disediakan oleh:"
+
+#: ../src/extension.js:814
+#, javascript-format
+msgid "Can not open %s"
+msgstr "Tidak dapat membuka %s"
+
+#: ../src/extension.js:821
+msgid "Weather Settings"
+msgstr "Pengaturan cuaca"
+
+#: ../src/extension.js:872 ../src/prefs.js:1021
+msgid "Invalid city"
+msgstr "Kota tidak tersedia"
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "Lokasi tidak tersedia! Mohon coba untuk membuatnya lagi."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Tenang"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Udara segar"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Angin sepoi-sepoi"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Angin lebut"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Sedikit berangin"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Angin segar"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Angin kuat"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Angin kencang"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Angin segar kencang"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Angin kencang dan kuat"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Badai"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Badai berbahaya"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Angin Topan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Minggu"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Senin"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Selasa"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Rabu"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Kamis"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Jumat"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sabtu"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "U"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "TL"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "T"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "Tg"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "BD"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "B"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "BL"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Memuat..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Mohon menunggu"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Kemendungan:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Kelembaban:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Tekanan:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Angin:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Kemaren"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d hari yang lalu"
+msgstr[1] "%d hari yang lalu"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Hari ini"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Besok"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Dalam %d hari"
+msgstr[1] "Dalam %d hari"
+
+#: ../src/openweathermap_org.js:181
+msgid "thunderstorm with light rain"
+msgstr "badai yang disertai sedikit hujan"
+
+#: ../src/openweathermap_org.js:183
+msgid "thunderstorm with rain"
+msgstr "badai yang disertai hujan"
+
+#: ../src/openweathermap_org.js:185
+msgid "thunderstorm with heavy rain"
+msgstr "badai yang disertai hujan lebat"
+
+#: ../src/openweathermap_org.js:187
+msgid "light thunderstorm"
+msgstr "badai kecil"
+
+#: ../src/openweathermap_org.js:189
+msgid "thunderstorm"
+msgstr "badai"
+
+#: ../src/openweathermap_org.js:191
+msgid "heavy thunderstorm"
+msgstr "badai besar"
+
+#: ../src/openweathermap_org.js:193
+msgid "ragged thunderstorm"
+msgstr "badai tersebar"
+
+#: ../src/openweathermap_org.js:195
+msgid "thunderstorm with light drizzle"
+msgstr "badai yang disertai sedikit gerimis"
+
+#: ../src/openweathermap_org.js:197
+msgid "thunderstorm with drizzle"
+msgstr "badai yang disertai gerimis"
+
+#: ../src/openweathermap_org.js:199
+msgid "thunderstorm with heavy drizzle"
+msgstr "badai yang disertai banyak gerimis"
+
+#: ../src/openweathermap_org.js:201
+msgid "light intensity drizzle"
+msgstr "sedikit gerimis"
+
+#: ../src/openweathermap_org.js:203
+msgid "drizzle"
+msgstr "gerimis"
+
+#: ../src/openweathermap_org.js:205
+msgid "heavy intensity drizzle"
+msgstr "gerimis yang rapat"
+
+#: ../src/openweathermap_org.js:207
+msgid "light intensity drizzle rain"
+msgstr "gerimis ringan"
+
+#: ../src/openweathermap_org.js:209
+msgid "drizzle rain"
+msgstr "hujan rintik-rintik"
+
+#: ../src/openweathermap_org.js:211
+msgid "heavy intensity drizzle rain"
+msgstr "hujan rinrik-rintik yang rapat"
+
+#: ../src/openweathermap_org.js:213
+msgid "shower rain and drizzle"
+msgstr "hujan deras dan gerimis"
+
+#: ../src/openweathermap_org.js:215
+msgid "heavy shower rain and drizzle"
+msgstr "hujan sangat deras dan gerimis"
+
+#: ../src/openweathermap_org.js:217
+msgid "shower drizzle"
+msgstr "gerimis deras"
+
+#: ../src/openweathermap_org.js:219
+msgid "light rain"
+msgstr "hujan ringan"
+
+#: ../src/openweathermap_org.js:221
+msgid "moderate rain"
+msgstr "hujan"
+
+#: ../src/openweathermap_org.js:223
+msgid "heavy intensity rain"
+msgstr "hujan deras"
+
+#: ../src/openweathermap_org.js:225
+msgid "very heavy rain"
+msgstr "hujan sangat deras"
+
+#: ../src/openweathermap_org.js:227
+msgid "extreme rain"
+msgstr "hujan sangat lebat"
+
+#: ../src/openweathermap_org.js:229
+msgid "freezing rain"
+msgstr "hujan membekukan"
+
+#: ../src/openweathermap_org.js:231
+msgid "light intensity shower rain"
+msgstr "hujan deras ringan"
+
+#: ../src/openweathermap_org.js:233
+msgid "shower rain"
+msgstr "hujan"
+
+#: ../src/openweathermap_org.js:235
+msgid "heavy intensity shower rain"
+msgstr "hujan lebat"
+
+#: ../src/openweathermap_org.js:237
+msgid "ragged shower rain"
+msgstr "hujan tersebar"
+
+#: ../src/openweathermap_org.js:239
+msgid "light snow"
+msgstr "salju ringan"
+
+#: ../src/openweathermap_org.js:241
+msgid "snow"
+msgstr "salju"
+
+#: ../src/openweathermap_org.js:243
+msgid "heavy snow"
+msgstr "salju hebat"
+
+#: ../src/openweathermap_org.js:245
+msgid "sleet"
+msgstr "hujan bercampur salju"
+
+#: ../src/openweathermap_org.js:247
+msgid "shower sleet"
+msgstr "hujan bercampur salju"
+
+#: ../src/openweathermap_org.js:249
+msgid "light rain and snow"
+msgstr "hujan ringan dan salju"
+
+#: ../src/openweathermap_org.js:251
+msgid "rain and snow"
+msgstr "hujan dan salju"
+
+#: ../src/openweathermap_org.js:253
+msgid "light shower snow"
+msgstr "salju ringan"
+
+#: ../src/openweathermap_org.js:255
+msgid "shower snow"
+msgstr "salju turun"
+
+#: ../src/openweathermap_org.js:257
+msgid "heavy shower snow"
+msgstr "salju lebat"
+
+#: ../src/openweathermap_org.js:259
+msgid "mist"
+msgstr "berkabut"
+
+#: ../src/openweathermap_org.js:261
+msgid "smoke"
+msgstr "berasap"
+
+#: ../src/openweathermap_org.js:263
+msgid "haze"
+msgstr "berembun"
+
+#: ../src/openweathermap_org.js:265
+msgid "Sand/Dust Whirls"
+msgstr "Badai pasir"
+
+#: ../src/openweathermap_org.js:267
+msgid "Fog"
+msgstr "Kabut"
+
+#: ../src/openweathermap_org.js:269
+msgid "sand"
+msgstr "pasir"
+
+#: ../src/openweathermap_org.js:271
+msgid "dust"
+msgstr "debu"
+
+#: ../src/openweathermap_org.js:273
+msgid "VOLCANIC ASH"
+msgstr "ABU VULKANIK"
+
+#: ../src/openweathermap_org.js:275
+msgid "SQUALLS"
+msgstr "KERIBUTAN"
+
+#: ../src/openweathermap_org.js:277
+msgid "TORNADO"
+msgstr "ANGIN TOPAN"
+
+#: ../src/openweathermap_org.js:279
+msgid "sky is clear"
+msgstr "langit bersih"
+
+#: ../src/openweathermap_org.js:281
+msgid "few clouds"
+msgstr "desikit berawan"
+
+#: ../src/openweathermap_org.js:283
+msgid "scattered clouds"
+msgstr "awan tersebar"
+
+#: ../src/openweathermap_org.js:285
+msgid "broken clouds"
+msgstr "awan terbelah"
+
+#: ../src/openweathermap_org.js:287
+msgid "overcast clouds"
+msgstr "awan menutupi"
+
+#: ../src/openweathermap_org.js:289
+msgid "Not available"
+msgstr "Tidak tersedia"
+
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr "Data salah ketika mencari \"%s\""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" tidak ditemukan"
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Lokasi"
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Penyedia"
+
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Buang %s ?"
+
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "baku"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Ubah nama"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "Hapus masukan"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Ubah koordinat"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "Tambahan penyedia cuaca baku"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Batal"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Simpan"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Cari berdasarkan lokasi atau koordinat"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "con. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Temukan"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Pilih penyedia cuaca baku"
+
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Kunci API pribadi dari openweathermap.org"
+
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Kunci API pribadi dari forecast.io"
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr "Perbarui batas waktu untuk cuaca sekarang [min]"
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr "Perbarui batas waktu untuk perkiraan cuaca [min]"
+
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+"Catatan: batas waktu prakiraan tidak dapat digunakan untuk forecast.io, "
+"karena mereka tidak menyediakan unduhan terpusah untuk cuaca sekarang dan "
+"prakiraannya."
+
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Kunci API pribadi dari openweathermap.org"
+
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
+
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Penyedia cuaca"
+
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr "Pilih penyedia geolokasi"
+
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Kunci aplikasi pribadi dari developer.mapquest.com"
+
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr "Penyedia geolokasi"
+
+#: ../data/weather-settings.ui:751
+msgid "Temperature Unit"
+msgstr "Satuan suhu"
+
+#: ../data/weather-settings.ui:762
+msgid "Wind Speed Unit"
+msgstr "Satuan kecepatan angin"
+
+#: ../data/weather-settings.ui:773
+msgid "Pressure Unit"
+msgstr "Satuan tekanan"
+
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Satuan"
+
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Posisi di panel"
+
+#: ../data/weather-settings.ui:880
+msgid "Wind Direction by Arrows"
+msgstr "Arah angin dengan tanda panah"
+
+#: ../data/weather-settings.ui:891
+msgid "Translate Conditions"
+msgstr "Terjemahkan kondisi"
+
+#: ../data/weather-settings.ui:902
+msgid "Symbolic Icons"
+msgstr "Ikon simbolis"
+
+#: ../data/weather-settings.ui:913
+msgid "Text on buttons"
+msgstr "Teks pada tombol"
+
+#: ../data/weather-settings.ui:924
+msgid "Temperature in Panel"
+msgstr "Suhu di panel"
+
+#: ../data/weather-settings.ui:935
+msgid "Conditions in Panel"
+msgstr "Kondisi di panel"
+
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "KOndisi di prakiraan"
+
+#: ../data/weather-settings.ui:957
+msgid "Center forecast"
+msgstr "Prakiraan tengah"
+
+#: ../data/weather-settings.ui:968
+msgid "Number of days in forecast"
+msgstr "Jumlah hari dalam prakiraan"
+
+#: ../data/weather-settings.ui:979
+msgid "Maximal number of digits after the decimal point"
+msgstr "Angka maksimal dari dijit sesudah titik desimal"
+
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Tengah"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Kanan"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Kiri"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Susunan"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Versi"
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "tidak dikenal (dibangun sendiri ?)"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>Tambahan cuaca untuk menampilkan informasi cuaca dari <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> untuk hampir semua lokasi di dunia.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Dipelihara oleh"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Halaman web"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">Progran ini TIDAK disertai GARANSI.\n"
+"Lihat <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\">GNU "
+"General Public License, version 2 or later</a> untuk informasi detilnya.</"
+"span>"
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "Perihal"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/it.po gnome-shell-extension-weather-0~20151114.git609/po/it.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/it.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/it.po	2015-11-17 15:10:32.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2013-01-16 11:13+0100\n"
 "Last-Translator: Odysseus86 <hal8600@hotmail.it>\n"
 "Language-Team: \n"
@@ -16,495 +16,701 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schema \"%s\" non trovato."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Impossibile aprire %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Località"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Ricarica le informazioni meteo"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Informazioni meteo fornite da:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "Impossibile aprire %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Impostazioni meteo"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Località non valida"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Calma"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Bava di vento"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Brezza leggera"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Brezza tesa"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Vento moderato"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Vento tefrescoso"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Vento forte"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Vento forte"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Burrasca"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Burrasca forte"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Tempesta"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Tempesta violenta"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Uragano"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Domenica"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Lunedì"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Martedì"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Mercoledì"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Giovedì"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Venerdì"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sabato"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NE"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "E"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SE"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NO"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Caricamento..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Attendere, prego."
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Nuvolosità:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Umidità:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Pressione:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vento:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Ieri"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s giorni fa"
+msgstr[1] "%s giorni fa"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Oggi"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Domani"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Tra %s giorni"
+msgstr[1] "Tra %s giorni"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "temporali con pioggia leggera"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "temporali"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "temporali con pioggia intensa"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "temporali isolati"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "temporali"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "temporali violenti"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "temporali isolati"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "temporali con pioggerella leggera"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "temporali con pioggerella"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "temporali con pioggerella intensa"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "pioggerella"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "pioggia leggera"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "pioggerella"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "pioggerella leggera"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "pioggia leggera"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "pioggerella intensa"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "pioggia mista a grandine"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "pioggia mista a forti grandinate"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "Pioggerella gelata"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "pioggia leggera"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "pioggia moderata"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "pioggia intensa"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "pioggia molto intensa"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "pioggia estrema"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "pioggia gelata"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "acquazzone leggero"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "acquazzoni"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "acquazzoni intensi"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "acquazzoni sparsi"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "nevicate leggere"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "neve"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "nevicate inyense"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "nevischio"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "rovesci piovosi"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "pioggia mista a neve"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "Pioggia mista a neve"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "rovesci nevosi leggeri"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "nevicate intermittenti"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "nevicate abbondanti"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "nebbiolina"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "fumo"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "foschia"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "Mulinelli di sabbia o polvere"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "Nebbia"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "sabbia"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "polvere"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "CENERI VULCANICHE"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "BURRASCHE"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "TORNADO"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "cielo terso"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "poco nuvoloso"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "rovesci piovosi sparsi"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "nubi sparse"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "molto nuvoloso"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Non disponibile"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Calma"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Bava di vento"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Brezza leggera"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Brezza tesa"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Vento moderato"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Vento tefrescoso"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Vento forte"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Vento forte"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Burrasca"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Burrasca forte"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Tempesta"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Tempesta violenta"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Uragano"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Domenica"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schema \"%s\" non trovato."
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Lunedì"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Località"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Martedì"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Mercoledì"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Rimuovere %s?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Giovedì"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Venerdì"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sabato"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NE"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "E"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SE"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SO"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "O"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NO"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Ieri"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Chiave API personale per openweathermap.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s giorni fa"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Chiave API personale per openweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Oggi"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Domani"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "Tra %s giorni"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Caricamento condizioni meteo..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Caricamento..."
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Chiave API personale per openweathermap.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Attendere, prego."
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Nuvolosità:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Informazioni meteo fornite da:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Umidità:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Pressione:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Chiave API personale per openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vento:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Informazioni meteo fornite da:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Unità di misura della temperatura"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Unità di misura dell'intensità del vento"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Unità di misura della pressione"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Posizione sul pannello"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Centro"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Destra"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Sinistra"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Direzione del vento tramite frecce"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Traduci le condizioni meteo"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Icone simboliche"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Mostra la temperatura sul pannello"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Mostra le condizioni meteo sul pannello"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Mostra le condizioni meteo sul pannello"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Centra previsione nel pannello"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Numero giorni previsioni"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Numero decimali"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "Chiave API personale per openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centro"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Nome della località"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Destra"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Rimuovere %s?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Sinistra"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Caricamento condizioni meteo..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "Tra %s giorni"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s giorni fa"
+#~ msgstr[1] "%s giorni fa"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s giorni fa"
+#~ msgstr[1] "%s giorni fa"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "Tra %s giorni"
+#~ msgstr[1] "Tra %s giorni"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nome della località"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/ja.po gnome-shell-extension-weather-0~20151114.git609/po/ja.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/ja.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/ja.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-shell-extension-weather 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-06-11 12:26+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <takeshi.aihana@gmail.com>\n"
@@ -16,496 +16,693 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr ""
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "次のスキーマが見つかりませんでした: \"%s\""
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "天気予報を更新する"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "設定"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "都市の名前が間違っています"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr ""
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr ""
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr ""
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr ""
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr ""
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr ""
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "昨日"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s日前"
+msgstr[1] "%s日前"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr ""
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr ""
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "%s日前"
+msgstr[1] "%s日前"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr ""
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr ""
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr ""
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr ""
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr ""
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr ""
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr ""
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr ""
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr ""
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr ""
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr ""
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr ""
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr ""
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr ""
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr ""
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr ""
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr ""
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr ""
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr ""
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr ""
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr ""
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr ""
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr ""
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr ""
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr ""
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr ""
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr ""
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr ""
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr ""
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr ""
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr ""
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr ""
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr ""
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr ""
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr ""
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr ""
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr ""
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr ""
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr ""
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr ""
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr ""
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr ""
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr ""
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "次のスキーマが見つかりませんでした: \"%s\""
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr ""
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "\"%s\" を削除しますか？"
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Monday"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Thursday"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "昨日"
-
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s日前"
-
-#: ../src/extension.js:1678
-msgid "Today"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1682
-#, fuzzy, python-format
-msgid "In %s days"
-msgstr "%s日前"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
 msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
 msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
 msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr ""
-
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr ""
-
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr ""
-
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr ""
-
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "気温の単位"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "風速の単位"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "気温の単位"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "配置する場所"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "中央"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "右側"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "左側"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "状態を日本語にする"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "シンボリック・アイコンにする"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "パネルに気温を表示する"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "パネルに状態を表示する"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "パネルに状態を表示する"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "中央"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "右側"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "左側"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "都市の名前"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "\"%s\" を削除しますか？"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "%s日前"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s日前"
+#~ msgstr[1] "%s日前"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s日前"
+#~ msgstr[1] "%s日前"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "%s日前"
+#~ msgstr[1] "%s日前"
+
+#~ msgid "Name of the city"
+#~ msgstr "都市の名前"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/LINGUAS gnome-shell-extension-weather-0~20151114.git609/po/LINGUAS
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/LINGUAS	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/LINGUAS	2015-11-17 15:10:32.000000000 +0000
@@ -1,15 +1,14 @@
-cs
-it
-fr
-es
 bg
-de
 ca
+cs
 da
 el
+es
 fi
+fr
 he
 hu
+it
 ja
 lt
 nb
@@ -20,8 +19,12 @@
 ro
 ru
 sk
+sr
+sr@latin
 sv
 uk
 vi
 zh_CN
-zh_TW
\ No newline at end of file
+zh_TW
+id
+de
\ No newline at end of file
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/lt.po gnome-shell-extension-weather-0~20151114.git609/po/lt.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/lt.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/lt.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-shell-extension-weather\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-12-21 12:43+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
@@ -18,523 +18,739 @@
 "X-Launchpad-Export-Date: 2012-12-24 04:00+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr ""
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Vietovės"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Atnaujinti orų informaciją"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Nustatymai (vietovė ir kt.)"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Netinkama vietovė"
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Ramu"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Lengvas vėjelis"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Švelnus vėjelis"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Vidutinis vėjelis"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Stiprėjantis vėjelis"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Vidutinis štormas"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Stiprėjantis štormas"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Smarkus štormas"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Audra"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Smarki audra"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Uraganas"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Sekmadienis"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Pirmadienis"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Antradienis"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Trečiadienis"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Ketvirtadienis"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Penktadienis"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Šeštadienis"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "Š"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "ŠR"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "R"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "PR"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "P"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "PV"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "V"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "ŠV"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Įkeliama..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Palaukite"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Drėgnumas:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Slėgis:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vėjas:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Vakar"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Prieš %s dienas"
+msgstr[1] "Prieš %s dienas"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Šiandien"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Rytoj"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Prieš %s dienas"
+msgstr[1] "Prieš %s dienas"
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Perkūnija (audringa)"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Perkūnija (audringa)"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Perkūnija (audringa)"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Vietomis perkūnija"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Perkūnija (audringa)"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Smarki audra su perkūnija"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Vietomis perkūnija"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Perkūnija (audringa)"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Perkūnija (audringa)"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Perkūnija (audringa)"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Dulksna"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Lietus su kruša"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Dulksna"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Dulksna"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Dulksna"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Lietus su kruša"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Lietus su kruša"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Šąlanti dulksna"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Lijundra"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 #, fuzzy
 msgid "moderate rain"
 msgstr "Vidutinis štormas"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Lijundra"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Lijundra"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Protarpiais pasnigs"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Trumpi lietūs"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Stipriai sninga"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Pustomas sniegas"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Stipriai sninga"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Šlapdriba"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Trumpi lietūs"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Šlapdriba (lietus ir sniegas)"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Šlapdriba (lietus ir sniegas)"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Protarpiais pasnigs"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Trumpi lietūs"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Stipriai sninga"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Ūkanota"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Daugiau debesuota"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Vietomis trumpi lietūs"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Daugiau debesuota"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Daugiau debesuota"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Neprieinama"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Ramu"
-
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Lengvas vėjelis"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Švelnus vėjelis"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Vidutinis vėjelis"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Stiprėjantis vėjelis"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Vidutinis štormas"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Stiprėjantis štormas"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Smarkus štormas"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Audra"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Smarki audra"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Uraganas"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Sekmadienis"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Pirmadienis"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Antradienis"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Vietovės"
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Trečiadienis"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Ketvirtadienis"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Pašalinti %s ?"
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Penktadienis"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Šeštadienis"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "Š"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Giedra"
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "ŠR"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "R"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "PR"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "P"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "PV"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "V"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "ŠV"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Vakar"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "Prieš %s dienas"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Šiandien"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Rytoj"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Įkeliami dabartiniai orai..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Įkeliama..."
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Palaukite"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Drėgnumas:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Slėgis:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vėjas:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatūros vienetai"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Vėjo greičio vienetai"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Slėgio vienetai"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Padėtis skydelyje"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Centre"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Dešinėje"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Kairėje"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Vėjo krypčiai naudoti rodykles"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Versti oro sąlygas"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr ""
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Rodyti temperatūrą skydelyje"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Rodyti oro sąlygas skydelyje"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Rodyti oro sąlygas skydelyje"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centre"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Dešinėje"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Kairėje"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Vietovės pavadinimas"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Pašalinti %s ?"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Įkeliami dabartiniai orai..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "Prieš %s dienas"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Prieš %s dienas"
+#~ msgstr[1] "Prieš %s dienas"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Prieš %s dienas"
+#~ msgstr[1] "Prieš %s dienas"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "Prieš %s dienas"
+#~ msgstr[1] "Prieš %s dienas"
+
+#~ msgid "Name of the city"
+#~ msgstr "Vietovės pavadinimas"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Įkeliama orų prognozė..."
@@ -581,9 +797,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Debesuota su pragiedruliais"
 
-#~ msgid "Clear"
-#~ msgstr "Giedra"
-
 #~ msgid "Sunny"
 #~ msgstr "Saulėta"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/nb.po gnome-shell-extension-weather-0~20151114.git609/po/nb.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/nb.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/nb.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:39+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: \n"
@@ -16,524 +16,714 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "…"
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr ""
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr ""
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Orkan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "søndag"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "mandag"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "tirsdag"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "onsdag"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "torsdag"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "fredag"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "lørdag"
+
+#: ../src/extension.js:1028
+msgid "N"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Laster …"
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Vent litt"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Fuktighet:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Lufttrykk:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vind:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "I dag"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "I morgen"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Tordenvær"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Tordenvær"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Tordenvær"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Lokalt tordenvær"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Tordenvær"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Kraftig tordenvær"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Lokalt tordenvær"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Tordenvær"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Tordenvær"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Tordenvær"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Yr"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Regn og hagl"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Yr"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Yr"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Yr"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Regn og hagl"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Regn og hagl"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Underkjølt yr"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Underkjølt regn"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Yr"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Underkjølt regn"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Underkjølt regn"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Lette snøbyger"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Regnbyger"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Kraftig snøfall"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Snøføyke"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Kraftig snøfall"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Sludd"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Regnbyger"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Regn og snø"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Regn og snø"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Lette snøbyger"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Regnbyger"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Kraftig snøfall"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Tåke"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Stort sett skyet"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Spredte regnbyger"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Stort sett skyet"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Stort sett skyet"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Ikke tilgjengelig"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Klarvær"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Orkan"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "søndag"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "mandag"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "tirsdag"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "torsdag"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "fredag"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "lørdag"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "I dag"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "I morgen"
-
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Laster værobservasjon …"
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Laster …"
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Vent litt"
-
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Fuktighet:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Lufttrykk:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vind:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatur:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr ""
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Lufttrykk:"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Left"
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
 msgstr ""
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr ""
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr ""
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatur:"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr ""
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr ""
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
+#: ../data/weather-settings.ui:993
+msgid "Left"
 msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Laster værobservasjon …"
+
 #~ msgid "Loading future weather ..."
 #~ msgstr "Laster værvarsel …"
 
@@ -582,9 +772,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Delvis skyet"
 
-#~ msgid "Clear"
-#~ msgstr "Klarvær"
-
 #~ msgid "Sunny"
 #~ msgstr "Sol"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/nl.po gnome-shell-extension-weather-0~20151114.git609/po/nl.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/nl.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/nl.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:39+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: \n"
@@ -16,524 +16,714 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr ""
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr ""
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Orkaan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Zondag"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Maandag"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Woensdag"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Donderdag"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Vrijdag"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Zaterdag"
+
+#: ../src/extension.js:1028
+msgid "N"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Laden ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Wachten alstublieft"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Luchtvochtigheid:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Luchtdruk:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Wind:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Vandaag"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Morgen"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Onweer"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Onweer"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Onweer"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Geïsoleerde onweer"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Onweer"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Zware onweer"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Geïsoleerde onweer"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Onweer"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Onweer"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Onweer"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Motregen"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Regen en hagel"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Motregen"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Motregen"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Motregen"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Regen en hagel"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Regen en hagel"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Motijzel"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "IJzel"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Motregen"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "IJzel"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "IJzel"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Lichte sneeuwbuien"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Regenbuien"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Zware sneeuwval"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Sneeuwstorm"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Zware sneeuwval"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Stofhagel"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Regenbuien"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Regen en sneeuw"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Regen en sneeuw"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Lichte sneeuwbuien"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Regenbuien"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Zware sneeuwval"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Nevelig"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Zwaar bewolkt"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Verspreide buien"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Zwaar bewolkt"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Zwaar bewolkt"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Helder"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Orkaan"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Zondag"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Maandag"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Dinsdag"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Woensdag"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Donderdag"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Vrijdag"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Zaterdag"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Vandaag"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Morgen"
-
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Laden aktueel weer ..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Laden ..."
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Wachten alstublieft"
-
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Luchtvochtigheid:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Luchtdruk:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Wind:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatuur:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr ""
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Luchtdruk:"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Left"
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
 msgstr ""
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr ""
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr ""
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatuur:"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr ""
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr ""
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
+#: ../data/weather-settings.ui:993
+msgid "Left"
 msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Laden aktueel weer ..."
+
 #~ msgid "Loading future weather ..."
 #~ msgstr "Laden weersverwachting ..."
 
@@ -582,9 +772,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Deels bewolkt"
 
-#~ msgid "Clear"
-#~ msgstr "Helder"
-
 #~ msgid "Sunny"
 #~ msgstr "Zonnig"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/pl.po gnome-shell-extension-weather-0~20151114.git609/po/pl.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/pl.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/pl.po	2015-11-17 15:10:32.000000000 +0000
@@ -2,540 +2,728 @@
 # Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extension-openweather package.
 # Piotr Sokół <psokol@jabster.pl>, 2011, 2012.
+# Marcin Niechciał 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-10-30 18:37+0100\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"Last-Translator: Marcin Niechciał <bastard79@o2.pl>\n"
 "Language-Team: polski <>\n"
-"Language: po\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Launchpad-Export-Date: 2012-10-30 09:44+0000\n"
 "X-Generator: Launchpad (build 16206)\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Nie odnaleziono schematu „%s”."
+#: ../src/extension.js:370
+#, fuzzy
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Openweathermap.org nie działa bez klucza api.\n"
+"Proszę zarejestrować się na stronie http://openweathermap.org/appid i wkleić "
+"uzyskany klucz api w ustawieniach."
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Forecast.io nie działa bez klucza api.\n"
+"Proszę zarejestrować się na stronie https://developer.forecast.io/register i "
+"wkleić uzyskany klucz api w ustawieniach."
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr "Nie można nawiązać połączenia z %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Lokalizacje"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Wczytaj ponownie komunikat pogodowy"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr ""
+msgstr "Dane pogody dostarcza:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr ""
+msgstr "Nie można otworzyć %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Ustawienia pogody"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Nieprawidłowa nazwa miasta"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "Nieprawidłowa lokalizacja! Proszę spróbować wpisać jeszcze raz."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "cisza"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "słaby wiatr"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "słaba bryza"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "łagodna bryza"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "umiarkowana bryza"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "rześka bryza"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "silna bryza"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "umiarkowany wicher"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "rześki wicher"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "silny wicher"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "sztorm"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "gwałtowny sztorm"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "huragan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Niedziela"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Poniedziałek"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Środa"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Czwartek"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Piątek"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sobota"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "pn."
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "pn.-wsch."
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "wsch."
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "pd.-wsch."
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "pd."
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "pd.-zach."
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "zach."
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "pn.-zach."
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Wczytywanie..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Proszę czekać"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Zachmurzenie"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Wilgotność względna:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Ciśnienie atmosferyczne:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Kierunek, prędkość wiatru:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s dzień temu"
+msgstr[1] "%s dni temu"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Jutro"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "W ciągu %s dnia"
+msgstr[1] "W ciągu %s dni"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
-msgstr ""
+msgstr "burza z piorunami z lekkimi opadami deszczu"
 
-#: ../src/extension.js:1083
-#, fuzzy
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
-msgstr "Burze"
+msgstr "burza z piorunami z opadami deszczu"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "burza z piorunami z silnymi opadami deszczu"
 
-#: ../src/extension.js:1087
-#, fuzzy
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
-msgstr "Lokalne burze"
+msgstr "mała burza z piorunami"
 
-#: ../src/extension.js:1089
-#, fuzzy
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
-msgstr "Burze"
+msgstr "burza z piorunami"
 
-#: ../src/extension.js:1091
-#, fuzzy
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
-msgstr "Silne burze"
+msgstr "silna burza z piorunami"
 
-#: ../src/extension.js:1093
-#, fuzzy
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
-msgstr "Lokalne burze"
+msgstr "burza z piorunami"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "burza z piorunami i słabą mżawką"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "burza z piorunami i mżawką"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "burze z piorunami z silną mżawką"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "słaba mżawka"
 
-#: ../src/extension.js:1103
-#, fuzzy
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
-msgstr "Mżawka"
+msgstr "mżawka"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "silna mżawka"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "słabe opady deszczu mżawka"
 
-#: ../src/extension.js:1109
-#, fuzzy
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
-msgstr "Mżawka"
+msgstr "mżawka"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "silne opady deszczu mżawka"
 
-#: ../src/extension.js:1113
-#, fuzzy
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
-msgstr "Deszcz z gradem"
+msgstr "opady deszczu i mżawka"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "silne opady deszczu i mżawka"
 
-#: ../src/extension.js:1117
-#, fuzzy
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
-msgstr "Marznąca mżawka"
+msgstr "mżawka"
 
-#: ../src/extension.js:1119
-#, fuzzy
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
-msgstr "Powiew"
+msgstr "słabe opady deszczu"
 
-#: ../src/extension.js:1121
-#, fuzzy
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
-msgstr "Bardzo silny wiatr"
+msgstr "umiarkowane opady deszczu"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
-msgstr ""
+msgstr "silne opady deszczu"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
-msgstr ""
+msgstr "silne opady deszczu"
 
-#: ../src/extension.js:1127
-#, fuzzy
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
-msgstr "Marznący deszcz"
+msgstr "ulewa"
 
-#: ../src/extension.js:1129
-#, fuzzy
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
-msgstr "Marznący deszcz"
+msgstr "marznący deszcz"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "słabe, przelotne opady deszczu"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
-msgstr ""
+msgstr "przelotne opady deszczu"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "silne opady śniegu"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
-msgstr ""
+msgstr "opady deszczu"
 
-#: ../src/extension.js:1139
-#, fuzzy
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
-msgstr "Zamieć śnieżna"
+msgstr "słabe opady śniegu"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
-msgstr ""
+msgstr "śnieg"
 
-#: ../src/extension.js:1143
-#, fuzzy
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
-msgstr "Obfity śnieg"
+msgstr "silne opady śniegu"
 
-#: ../src/extension.js:1145
-#, fuzzy
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
-msgstr "Deszcz ze śniegiem"
+msgstr "deszcz ze śniegiem"
 
-#: ../src/extension.js:1147
-#, fuzzy
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
-msgstr "Przelotne opady deszczu"
+msgstr "przelotne opady deszczu ze śniegiem"
 
-#: ../src/extension.js:1149
-#, fuzzy
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
-msgstr "Deszcz ze śniegiem"
+msgstr "słabe, przelotne opady deszczu ze śniegiem"
 
-#: ../src/extension.js:1151
-#, fuzzy
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
-msgstr "Deszcz ze śniegiem"
+msgstr "deszcz ze śniegiem"
 
-#: ../src/extension.js:1153
-#, fuzzy
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
-msgstr "Lekkie, przelotne opady śniegu"
+msgstr "słabe, przelotne opady śniegu"
 
-#: ../src/extension.js:1155
-#, fuzzy
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
-msgstr "Przelotne opady deszczu"
+msgstr "przelotne opady śniegu"
 
-#: ../src/extension.js:1157
-#, fuzzy
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
-msgstr "Obfity śnieg"
+msgstr "silne opady śniegu"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
-msgstr ""
+msgstr "mgła"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
-msgstr ""
+msgstr "dym"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
-msgstr ""
+msgstr "mgła"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
-msgstr ""
+msgstr "wiry piasku/pyłu"
 
-#: ../src/extension.js:1167
-#, fuzzy
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
-msgstr "Mgła"
+msgstr "mgła"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
-msgstr ""
+msgstr "piasek"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
-msgstr ""
+msgstr "pył"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
-msgstr ""
+msgstr "pył wulkaniczny"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
-msgstr ""
+msgstr "szkwał"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
-msgstr ""
+msgstr "tornado"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
-msgstr ""
+msgstr "bezchmurnie"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr ""
+msgstr "kilka chmur"
 
-#: ../src/extension.js:1183
-#, fuzzy
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
-msgstr "Rozproszone, przelotne opady deszczu"
+msgstr "mało chmur"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
-msgstr ""
+msgstr "dużo chmur"
 
-#: ../src/extension.js:1187
-#, fuzzy
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
-msgstr "Duże zachmurzenie"
+msgstr "całkowite zachmurzenie"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Nie dostępne"
 
-#: ../src/extension.js:1227
-#, fuzzy
-msgid "Calm"
-msgstr "Cisza"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr "Błędne dane podczas wyszukiwania \"%s\""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "Nie odnaleziono \"%s\""
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Dostawca"
 
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Powiew"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Słaby wiatr"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Łagodny wiatr"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Umiarkowany wiatr"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Dość silny wiatr"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Usunąć %s?"
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Silny wiatr"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "domyślnie"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Edytuj nazwę"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "Usuń wpis"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Edytuj współrzędne"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "Domyślny dostawca informacji pogodowych"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Zapisz"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Szukaj po lokalizacji lub współrzędnych"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "np. Warszawa, mazowieckie, Polska 52.2319237,21.0067265"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Szukaj"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Wybierz domyślnego dostawcę informacji pogodowych"
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Bardzo silny wiatr"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Osobisty klucz Api od openweathermap.org"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Wicher"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Osobisty klucz Api od forecast.io"
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Silny wicher"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr "Aktualizacja informacji o aktualnej pogodzie [min]"
 
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Sztorm"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr "Aktualizacja informacji prognozy pogody [min]"
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
+"Uwaga: Ustawienia aktualizacji nie działają z serwisem forecast.io, ponieważ "
+"nie ma możliwości pobrania informacji osobno dla aktualnej pogody i prognozy."
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Huragan"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Niedziela"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Poniedziałek"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Wtorek"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Środa"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Czwartek"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Piątek"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sobota"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "pn."
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "pn.-wsch."
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "wsch."
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "pd.-wsch."
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "pd."
-
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "pd.-zach."
-
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "zach."
-
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "pn.-zach."
-
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Wczoraj"
-
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s dni temu"
-
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Dzisiaj"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Jutro"
-
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "W ciągu %s dni"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Wczytywanie bieżącej pogody..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Wczytywanie..."
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Proszę czekać"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Osobisty klucz Api od openweathermap.org"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Wilgotność względna:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Dostawca informacji pogodowej"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Ciśnienie atmosferyczne:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr "Wybierz dostawcę geolokalizacji"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Kierunek, prędkość wiatru:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Osobisty klucz Api od developer.mapquest.com"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr "Dostawca geolokalizacji"
+
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Jednostka temperatury"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Jednostka prędkości wiatru"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Jednostka ciśnienia"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Jednostki"
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Położenie na panelu"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Na środku"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Po prawej"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Po lewej"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Strzałka kierunku wiatru"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Tłumaczenia warunków pogodowych"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
-msgstr "Ikony symboliczne"
+msgstr "Piktogramy"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
-msgstr ""
+msgstr "Tekst na przyciskach"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatura na panelu"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Warunki pogodowe na panelu"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Warunki pogodowe w prognozie"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr ""
+msgstr "Wyśrodkuj prognozę"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
-msgstr ""
+msgstr "Liczba dni prognozy"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
-msgstr ""
+msgstr "Maksymalna liczba cyfr po przecinku"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Na środku"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Po prawej"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Po lewej"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Wygląd"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Wersja:"
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "nieznana"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>Rozszerzenie pogody pobiera informację z <a href=\"https://"
+"openweathermap.org/\">Openweathermap</a> lub <a href=\"https://forecast.io"
+"\">forecast.io</a> dla niemal wszystkich lokalizacji na świecie.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Autor"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Strona www"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Nazwa miasta"
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "O programie"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Usunąć %s?"
+#~ msgid "Loading current weather ..."
+#~ msgstr "Wczytywanie bieżącej pogody..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "W ciągu %s dni"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dzień temu"
+#~ msgstr[1] "%s dni temu"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dzień temu"
+#~ msgstr[1] "%s dni temu"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "W ciągu jednego dnia"
+#~ msgstr[1] "W ciągu %s dni"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nazwa miasta"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Wczytywanie prognozy pogody..."
@@ -585,9 +773,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Częściowe zachmurzenie"
 
-#~ msgid "Clear"
-#~ msgstr "Pogodnie"
-
 #~ msgid "Sunny"
 #~ msgstr "Słonecznie"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/POTFILES.in gnome-shell-extension-weather-0~20151114.git609/po/POTFILES.in
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/POTFILES.in	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/POTFILES.in	2015-11-17 15:10:32.000000000 +0000
@@ -1,2 +1,5 @@
 ../src/extension.js
+../src/forecast_io.js
+../src/openweathermap_org.js
 ../src/prefs.js
+../data/weather-settings.ui
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/pt_BR.po gnome-shell-extension-weather-0~20151114.git609/po/pt_BR.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/pt_BR.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/pt_BR.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:49+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2014-07-24 09:49-0300\n"
 "Last-Translator: Diego Neves <diego@diegoneves.eti.br>\n"
 "Language-Team: Portugês Brasil ; Diego Neves <diego@diegoneves.eti.br>,\n"
@@ -18,498 +18,705 @@
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schema \"%s\" não encontrado."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Impossível abrir %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Locais"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Recarregar informações meteorológicas"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "Meteorologia fornecida por:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "Impossível abrir %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Configurações"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Cidade inválida"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Calmo"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Aragem"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Brisa leve"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Brisa fraca"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Brisa moderada"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Brisa forte"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Vento fresco"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Vento forte"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Ventania"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Ventania forte"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Tempestade"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Tempestade violenta"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Furacão"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Terça-feira"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Quarta-feira"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Quinta-feira"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Sexta-feira"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NE"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "E"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SE"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NO"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Carregando ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Espere um momento"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Nebulosidade:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Humidade:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Pressão:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vento:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s dias atrás"
+msgstr[1] "%s dias atrás"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Hoje"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Em %s dias"
+msgstr[1] "Em %s dias"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "temporal com chuva leve"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "Tempestade com raios"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "temporal com chuva pesada"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "Tempestades isoladas"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "Tempestade"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "Tempestade pesada"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "Tempestades isoladas"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "temporal com chuvisco"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "temporal com garoa"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "temporal com garoa pesada"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "garoa leve"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "Chuvisco"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "garoa densa"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "chuva com nebulosidade baixa"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "Chuvisco"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "chuva com nebulosidade pesada"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "Chuva e granizo"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "chuva pesada com garoa"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "Geada"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "chuva leve"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "chuva moderada"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "chuva pesada"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "chuva muito pesada"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "chuva forte"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "Chuva de granizo"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "chuva leve"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "chuva"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "chuva pesada"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "chuvas irregulares"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "Neve"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "neve"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "Forte nevada"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "Granizo"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "Chuva de granizo"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "Chuva e neve"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "Chuva e neve"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "Nevadas leves"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "Chuva"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "Forte nevada"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "névoa"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "fumaça"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "neblina"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "Jatos de poeira/areia"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "Neblina"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "areia"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "poeira"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "CINZAS VULCANICAS"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "RAJADAS"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "TORNADO"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "céu limpo"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr "poucas núvens"
+msgstr "poucas nuvens"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "nuvens esparsas"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "nublado"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "Muito nublado"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Não disponível"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Calmo"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Aragem"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Brisa leve"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Brisa fraca"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Brisa moderada"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Brisa forte"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Vento fresco"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Vento forte"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Ventania"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Ventania forte"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Tempestade"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Tempestade violenta"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Furacão"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Domingo"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schema \"%s\" não encontrado."
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Segunda-feira"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Locais"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Terça-feira"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Quarta-feira"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Remover %s ?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Quinta-feira"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Sexta-feira"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sábado"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Limpo"
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NE"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "E"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SE"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SO"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "O"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NO"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Ontem"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Api key pessoal do openweathermap.org"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s dias atrás"
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Api key pessoal do openweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Hoje"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Amanhã"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "Em %s dias"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Carregando as condições meteorológicas ..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Carregando ..."
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Api key pessoal do openweathermap.org"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Espere um momento"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "Nebulosidade:"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Meteorologia fornecida por:"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Humidade:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Pressão:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Api key pessoal do openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vento:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Meteorologia fornecida por:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Unidade de temperatura"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Unidade de velocidade do vento"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Unidade de pressão"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Posição no painel"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Centro"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Direita"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Esquerda"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Direção do vento usando setas"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Traduzir condições"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Ícones simbólicos"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr "Texto nos Botões"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatura no painel"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Condições no painel"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Condições no painel"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "Previsão central"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "Número de dias de previsão"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "Numero de máximo de digitos decimais"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "Api key pessoal do openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centro"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Nome da cidade"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Direita"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Remover %s ?"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Esquerda"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Carregando as condições meteorológicas ..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "Em %s dias"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dias atrás"
+#~ msgstr[1] "%s dias atrás"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dias atrás"
+#~ msgstr[1] "%s dias atrás"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "Em %s dias"
+#~ msgstr[1] "Em %s dias"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nome da cidade"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Carregando a previsão do tempo ..."
@@ -559,9 +766,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Parcialmente nublado"
 
-#~ msgid "Clear"
-#~ msgstr "Limpo"
-
 #~ msgid "Sunny"
 #~ msgstr "Ensolarado"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/pt.po gnome-shell-extension-weather-0~20151114.git609/po/pt.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/pt.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/pt.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:40+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: Português ; Daniel Miranda <dmiranda@gmail.com>,\n"
@@ -17,524 +17,740 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Schema \"%s\" não encontrado."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Locais"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Recarregar informações meteorológicas"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Configurações"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Cidade inválida"
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Calmo"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Aragem"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Brisa leve"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Brisa fraca"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Brisa moderada"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Brisa forte"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Vento fresco"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Vento forte"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Ventania"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Ventania forte"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Tempestade"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Tempestade violenta"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Furacão"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Terça-feira"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Quarta-feira"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Quinta-feira"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Sexta-feira"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "NE"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "E"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "SE"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "SO"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "O"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "NO"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Carregando ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Espere um momento"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Humidade:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Pressão:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vento:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s dias atrás"
+msgstr[1] "%s dias atrás"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Hoje"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "Em %s dias"
+msgstr[1] "Em %s dias"
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Tempestade"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Tempestade"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Tempestade"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Tempestades isoladas"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Tempestade"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Tempestade severa"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Tempestades isoladas"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Tempestade"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Tempestade"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Tempestade"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Chuvisco"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Chuva e granizo"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Chuvisco"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Chuvisco"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Chuvisco"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Chuva e granizo"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Chuva e granizo"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Geada"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Aragem"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 #, fuzzy
 msgid "moderate rain"
 msgstr "Vento forte"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Chuva congelada"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Chuva congelada"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Nevadas leves"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Chuva"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Forte nevada"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Neve"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Forte nevada"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Granizo"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Chuva"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Chuva e neve"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Chuva e neve"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Nevadas leves"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Chuva"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Forte nevada"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Neblina"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Muito nublado"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Chuvas Isoladas"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Muito nublado"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Muito nublado"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Não disponível"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Calmo"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Aragem"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Brisa leve"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Brisa fraca"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Brisa moderada"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Brisa forte"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Vento fresco"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Vento forte"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Ventania"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Ventania forte"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Tempestade"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Tempestade violenta"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Furacão"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Domingo"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schema \"%s\" não encontrado."
 
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Segunda-feira"
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Locais"
 
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Terça-feira"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Quarta-feira"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Remover %s ?"
 
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Quinta-feira"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Sexta-feira"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr ""
 
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sábado"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Limpo"
 
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "N"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "NE"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "E"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "SE"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "S"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "SO"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "O"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "NO"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Ontem"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s dias atrás"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Hoje"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Amanhã"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "Em %s dias"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Carregando as condições meteorológicas ..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Carregando ..."
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Espere um momento"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Humidade:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Pressão:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vento:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Unidade de temperatura"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Unidade de velocidade do vento"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Unidade de pressão"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Posição no painel"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Centro"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Direita"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Esquerda"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Direção do vento usando setas"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Traduzir condições"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Ícones simbólicos"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatura no painel"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Condições no painel"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Condições no painel"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centro"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Direita"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Esquerda"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Nome da cidade"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Remover %s ?"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Carregando as condições meteorológicas ..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "Em %s dias"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dias atrás"
+#~ msgstr[1] "%s dias atrás"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s dias atrás"
+#~ msgstr[1] "%s dias atrás"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "Em %s dias"
+#~ msgstr[1] "Em %s dias"
+
+#~ msgid "Name of the city"
+#~ msgstr "Nome da cidade"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Carregando a previsão do tempo ..."
@@ -584,9 +800,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Parcialmente nublado"
 
-#~ msgid "Clear"
-#~ msgstr "Limpo"
-
 #~ msgid "Sunny"
 #~ msgstr "Ensolarado"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/ro.po gnome-shell-extension-weather-0~20151114.git609/po/ro.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/ro.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/ro.po	2015-11-17 15:10:32.000000000 +0000
@@ -2,12 +2,13 @@
 # Copyright (C) 2011
 # This file is distributed under the same license as the gnome-shell-extension-openweather package.
 # Marian Vasile <marianvasile@upcmail.ro>, 2011.
+# Darius Berghe <darius.berghe@gmx.com>, edit in 03.10.2014
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simon04-gnome-shell-extension-weather\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:40+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: \n"
@@ -21,599 +22,706 @@
 "X-Poedit-Country: ROMANIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:714
-msgid "Locations"
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Nu se poate deschide %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
+msgid "Locations"
+msgstr "Locații"
+
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
-msgstr ""
+msgstr "Actualizează prognoza"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr ""
+msgstr "Prognoză oferită de:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr ""
+msgstr "Nu se poate deschide %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
-msgstr ""
+msgstr "Setări"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
+msgstr "Oraș invalid"
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Calm"
+
+#: ../src/extension.js:985
+msgid "Light air"
 msgstr ""
 
-#: ../src/extension.js:1083
-#, fuzzy
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Briză ușoară"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Briză ușoară"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Briză moderată"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Briză moderată"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Briză puternică"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Furtună moderată"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Furtună moderată"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Furtună puternică"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Furtună"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Furtună puternică"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Uragan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Duminică"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Luni"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Marți"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Miercuri"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Joi"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Vineri"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sâmbătă"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Se încarcă ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Așteptați"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Nebulozitate:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Umiditate:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Presiune:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vânt:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Ieri"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s zile în urmă"
+msgstr[1] "%s zile în urmă"
+msgstr[2] "%s zile în urmă"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Azi"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Mâine"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "În %s zile"
+msgstr[1] "În %s zile"
+msgstr[2] "În %s zile"
+
+#: ../src/openweathermap_org.js:181
+msgid "thunderstorm with light rain"
+msgstr "Furtună cu ploaie ușoară"
+
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
-msgstr "Furtuni"
+msgstr "Furtună"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Furtună cu ploaie puternică"
 
-#: ../src/extension.js:1087
-#, fuzzy
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
-msgstr "Furtuni izolate"
+msgstr "Furtună moderată"
 
-#: ../src/extension.js:1089
-#, fuzzy
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
-msgstr "Furtuni"
+msgstr "Furtună"
 
-#: ../src/extension.js:1091
-#, fuzzy
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
-msgstr "Furtuni severe"
+msgstr "Furtună puternică"
 
-#: ../src/extension.js:1093
-#, fuzzy
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "Furtuni izolate"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Furtună cu burniță"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Furtună cu burniță"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Furtună cu burniță"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "Burniță ușoară"
 
-#: ../src/extension.js:1103
-#, fuzzy
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "Burniță"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Burniță intensă"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Burniță ușoară"
 
-#: ../src/extension.js:1109
-#, fuzzy
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "Burniță"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Burniță intensă"
 
-#: ../src/extension.js:1113
-#, fuzzy
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
-msgstr "Ploaie cu grindină"
+msgstr "Ploaie"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Ploaie puternică"
 
-#: ../src/extension.js:1117
-#, fuzzy
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "Burniță rece"
 
-#: ../src/extension.js:1119
-#, fuzzy
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
-msgstr "Ploaie rece"
+msgstr "Ploaie ușoară"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
-msgstr ""
+msgstr "Ploaie moderată"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
-msgstr ""
+msgstr "Ploaie puternică"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
-msgstr ""
+msgstr "Ploaie foarte puternică"
 
-#: ../src/extension.js:1127
-#, fuzzy
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
-msgstr "Ploaie rece"
+msgstr "Ploaie foarte puternică"
 
-#: ../src/extension.js:1129
-#, fuzzy
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "Ploaie rece"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Averse ușoare"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
-msgstr ""
+msgstr "Averse"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Averse puternice"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
-msgstr ""
+msgstr "Averse răzlețe"
 
-#: ../src/extension.js:1139
-#, fuzzy
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
-msgstr "Ninsoare viscolită"
+msgstr "Ninsoare ușoară"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
-msgstr ""
+msgstr "Ninsoare"
 
-#: ../src/extension.js:1143
-#, fuzzy
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "Ninsoare abundentă"
 
-#: ../src/extension.js:1145
-#, fuzzy
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "Lapoviță"
 
-#: ../src/extension.js:1147
-#, fuzzy
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
-msgstr "Averse"
+msgstr "Lapoviță"
 
-#: ../src/extension.js:1149
-#, fuzzy
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "Lapoviță"
 
-#: ../src/extension.js:1151
-#, fuzzy
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "Lapoviță"
 
-#: ../src/extension.js:1153
-#, fuzzy
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "Ninsoare ușoară în averse"
 
-#: ../src/extension.js:1155
-#, fuzzy
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
-msgstr "Averse"
+msgstr "Ninsoare"
 
-#: ../src/extension.js:1157
-#, fuzzy
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "Ninsoare abundentă"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
-msgstr ""
+msgstr "Ceață"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
-msgstr ""
+msgstr "Ceață"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
-msgstr ""
+msgstr "Ceață"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
-#, fuzzy
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "Ceață"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
-msgstr ""
+msgstr "Nisip"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
-msgstr ""
+msgstr "Praf"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
-msgstr ""
+msgstr "Cenușă vulcanică"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
-msgstr ""
+msgstr "Vijelie"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
-msgstr ""
+msgstr "Tornadă"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
-msgstr ""
+msgstr "Cer senin"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr ""
+msgstr "Câțiva nori"
 
-#: ../src/extension.js:1183
-#, fuzzy
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
-msgstr "Averse răzlețe"
+msgstr "Nori răzleți"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
-msgstr ""
+msgstr "Parțial noros"
 
-#: ../src/extension.js:1187
-#, fuzzy
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
-msgstr "Majoritar înnorat "
+msgstr "Majoritar înnorat"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Indisponibil"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr ""
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr ""
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Schema \"%s\" nu a fost găsită"
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr ""
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Locații"
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr ""
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Confirmi ștergerea %s ?"
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Uragan"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Duminică"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Luni"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Marți"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Miercuri"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Joi"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Vineri"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sâmbătă"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr ""
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Cheie personală API openweathermap.org"
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr ""
+#: ../data/weather-settings.ui:545
+#, fuzzy
+msgid "Personal Api key from forecast.io"
+msgstr "Cheie personală API openweathermap.org"
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Azi"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Mâine"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Cheie personală API openweathermap.org"
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Se încarcă vremea curentă..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Se încarcă"
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Așteptați"
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Prognoză oferită de:"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Umiditate:"
-
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Presiune:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Cheie personală API openweathermap.org"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vânt:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Prognoză oferită de:"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
-msgstr "Temperatură:"
+msgstr "Temperatură"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
-msgstr ""
+msgstr "Viteză vânt"
 
-#: ../src/prefs.js:132
-#, fuzzy
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
-msgstr "Presiune:"
-
-#: ../src/prefs.js:134
-msgid "Position in Panel"
-msgstr ""
+msgstr "Presiune"
 
-#: ../src/prefs.js:135
-msgid "Center"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr ""
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Poziție în panou"
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
-msgstr ""
+msgstr "Săgeți pentru direcția vântului"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
-msgstr ""
+msgstr "Tradu condițiile"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
-msgstr ""
+msgstr "Iconițe simbolice"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
-msgstr ""
+msgstr "Text butoane"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
-msgstr "Temperatură:"
+msgstr "Temperatură în panou"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
-msgstr ""
+msgstr "Condiții în panou"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Condiții în panou"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr ""
+msgstr "Centrează prognoza"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
-msgstr ""
+msgstr "Prognoza pe câte zile?"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
-msgstr ""
-
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr ""
-
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr ""
-
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr ""
-
-#~ msgid "Loading future weather ..."
-#~ msgstr "Se încarcă prognoza..."
-
-#~ msgid "Tornado"
-#~ msgstr "Tornadă"
-
-#~ msgid "Tropical storm"
-#~ msgstr "Furtună tropicală"
-
-#~ msgid "Mixed rain and sleet"
-#~ msgstr "Măzăriche"
-
-#~ msgid "Mixed snow and sleet"
-#~ msgstr "Măzăriche"
-
-#~ msgid "Snow flurries"
-#~ msgstr "Ninsoare ușoară"
+msgstr "Număr de zecimale după virgulă"
 
-#~ msgid "Snow"
-#~ msgstr "Ninsoare"
-
-#~ msgid "Hail"
-#~ msgstr "Grindină"
-
-#~ msgid "Dust"
-#~ msgstr "Praf"
-
-#~ msgid "Haze"
-#~ msgstr "Ceață ușoară"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Centru"
 
-#~ msgid "Smoky"
-#~ msgstr "Întunecat"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Dreapta"
 
-#~ msgid "Blustery"
-#~ msgstr "Zgomotos"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Stânga"
 
-#~ msgid "Windy"
-#~ msgstr "Rafale de vânt"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
 
-#~ msgid "Cold"
-#~ msgstr "Rece"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#~ msgid "Cloudy"
-#~ msgstr "Înnorat"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
 
-#~ msgid "Partly cloudy"
-#~ msgstr "Parțial înnorat"
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
 
-#~ msgid "Clear"
-#~ msgstr "Senin"
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
 
-#~ msgid "Sunny"
-#~ msgstr "Însorit"
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
 
-#~ msgid "Fair"
-#~ msgstr "Vreme bună"
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
 
-#~ msgid "Hot"
-#~ msgstr "Foarte cald"
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
 
-#~ msgid "Scattered thunderstorms"
-#~ msgstr "Furtuni răzlețe"
+#~ msgid "Loading current weather ..."
+#~ msgstr "Se încarcă prognoza ..."
 
 #, fuzzy
-#~ msgid "Isolated showers"
-#~ msgstr "Ploi izolate"
+#~ msgid "In %d days"
+#~ msgstr "În %s zile"
 
-#~ msgid "Scattered snow showers"
-#~ msgstr "Ninsori răzlețe"
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s zile în urmă"
+#~ msgstr[1] "%s zile în urmă"
+#~ msgstr[2] "%s zile în urmă"
 
-#~ msgid "Thundershowers"
-#~ msgstr "Ploi abundente în averse"
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s zile în urmă"
+#~ msgstr[1] "%s zile în urmă"
+#~ msgstr[2] "%s zile în urmă"
 
-#~ msgid "Snow showers"
-#~ msgstr "Ninsori în averse"
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "În %s zile"
+#~ msgstr[1] "În %s zile"
+#~ msgstr[2] "În %s zile"
 
-#~ msgid "Isolated thundershowers"
-#~ msgstr "Ploi izolate"
+#~ msgid "Name of the city"
+#~ msgstr "Numele orașului"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/ru.po gnome-shell-extension-weather-0~20151114.git609/po/ru.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/ru.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/ru.po	2015-11-17 15:10:32.000000000 +0000
@@ -1,545 +1,738 @@
 # Russian translation for gnome-shell-extension-openweather
-# Copyright (C) 2013
+# Copyright (C) 2015
 # This file is distributed under the same license as the gnome-shell-extension-openweather package.
 # Gankov Andrey <gav@qsolution.ru>, 2011.
 # Stas Solovey <whats_up@tut.by>, 2012.
 # Timon <timosha@gmail.com>, 2013.
+# Karbovnichiy Vasiliy <menstenebris@gmail.com>, 2015.
+# Ivan Komaritsyn <vantu5z@mail.ru>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
-"PO-Revision-Date: 2013-02-06 14:41+0500\n"
-"Last-Translator: Timon <timosha@gmail.com>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-10-14 09:45+0300\n"
+"Last-Translator: Ivan Komaritsyn <vantu5z@mail.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
-msgstr "…"
+msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Схема «%s» не найдена"
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr "Не удалось подключиться к %s"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "Города"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Обновить информацию о погоде"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr ""
+msgstr "Информация о погоде предоставлена:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr ""
+msgstr "Невозможно открыть %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Настройки апплета погоды"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Неправильный город"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "Неверное местоположение! Попробуйте создать его заново."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Штиль"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Тихий ветер"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Лёгкий ветер"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Слабый ветер"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Умеренный ветер"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Свежий ветер"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Сильный ветер"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Крепкий ветер"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Очень крепкий ветер"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Шторм"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Сильный шторм"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Жестокий шторм"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Ураган"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Понедельник"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Среда"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Четверг"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Пятница"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Суббота"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "С"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "СВ"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "В"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "ЮВ"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "Ю"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "ЮЗ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "З"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "СЗ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Загрузка ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Пожалуйста подождите"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Облачность:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Влажность:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Давление:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Ветер:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Вчера"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d дней назад"
+msgstr[1] "%d день назад"
+msgstr[2] "%d дня назад"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Сегодня"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Завтра"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "На %d день"
+msgstr[1] "На %d день"
+msgstr[2] "На %d день"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
-msgstr ""
+msgstr "Гроза с легким дождем"
 
-#: ../src/extension.js:1083
-#, fuzzy
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
-msgstr "Грозы"
+msgstr "Гроза с дождем"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Гроза с сильным дождем"
 
-#: ../src/extension.js:1087
-#, fuzzy
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
-msgstr "Локальные грозы"
+msgstr "Легкая гроза"
 
-#: ../src/extension.js:1089
-#, fuzzy
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
-msgstr "Грозы"
+msgstr "Гроза"
 
-#: ../src/extension.js:1091
-#, fuzzy
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
-msgstr "Сильные грозы"
+msgstr "Сильная гроза"
 
-#: ../src/extension.js:1093
-#, fuzzy
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
-msgstr "Локальные грозы"
+msgstr "Возможна гроза"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Гроза с легкой моросью"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Гроза с моросью"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Гроза с сильной моросью"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "Слабая морось"
 
-#: ../src/extension.js:1103
-#, fuzzy
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "Морось"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Сильная морось"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Слабый моросящий дождь"
 
-#: ../src/extension.js:1109
-#, fuzzy
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
-msgstr "Морось"
+msgstr "Моросящий дождь"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Сильный моросящий дождь"
 
-#: ../src/extension.js:1113
-#, fuzzy
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
-msgstr "Дождь с градом"
+msgstr "Ливень и морось"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Сильный ливень и морось"
 
-#: ../src/extension.js:1117
-#, fuzzy
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
-msgstr "Ледяной моросящий дождь"
+msgstr "Ливневый моросящий дождь"
 
-#: ../src/extension.js:1119
-#, fuzzy
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
-msgstr "Слабый ветер"
+msgstr "Легкий дождь"
 
-#: ../src/extension.js:1121
-#, fuzzy
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
-msgstr "Крепкий ветер"
+msgstr "Умеренный дождь"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
-msgstr ""
+msgstr "Сильный дождь"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
-msgstr ""
+msgstr "Очень сильный дождь"
 
-#: ../src/extension.js:1127
-#, fuzzy
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
-msgstr "Ледяной дождь"
+msgstr "Проливной дождь"
 
-#: ../src/extension.js:1129
-#, fuzzy
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
-msgstr "Ледяной дождь"
+msgstr "Град"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Слабый ливень"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
-msgstr ""
+msgstr "Ливень"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Сильный ливень"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
-msgstr ""
+msgstr "Локальный ливень"
 
-#: ../src/extension.js:1139
-#, fuzzy
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
-msgstr "Низовая метель"
+msgstr "Легкий снег"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
-msgstr ""
+msgstr "Снег"
 
-#: ../src/extension.js:1143
-#, fuzzy
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
-msgstr "Сильный снегопад"
+msgstr "Сильный снег"
 
-#: ../src/extension.js:1145
-#, fuzzy
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
-msgstr "Снежная крупа"
+msgstr "Мокрый снег"
 
-#: ../src/extension.js:1147
-#, fuzzy
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
-msgstr "Ливни"
+msgstr "Обильный мокрый снег"
 
-#: ../src/extension.js:1149
-#, fuzzy
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
-msgstr "Снег с дождём"
+msgstr "Снег с легким дождём"
 
-#: ../src/extension.js:1151
-#, fuzzy
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "Снег с дождём"
 
-#: ../src/extension.js:1153
-#, fuzzy
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "Небольшой снегопад"
 
-#: ../src/extension.js:1155
-#, fuzzy
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
-msgstr "Ливни"
+msgstr "Снегопад"
 
-#: ../src/extension.js:1157
-#, fuzzy
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "Сильный снегопад"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
-msgstr ""
+msgstr "Мгла"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
-msgstr ""
+msgstr "Дымка"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
-msgstr ""
+msgstr "Легкий туман"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
-msgstr ""
+msgstr "Песчанные/Пылевые Вихри"
 
-#: ../src/extension.js:1167
-#, fuzzy
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
-msgstr "Туман"
+msgstr "Густой туман"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
-msgstr ""
+msgstr "Песок"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
-msgstr ""
+msgstr "Пыль"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
-msgstr ""
+msgstr "ВУЛКАНИЧЕСКИЙ ПЕПЕЛ"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
-msgstr ""
+msgstr "ШКВАЛЬНЫЙ ВЕТЕР"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
-msgstr ""
+msgstr "ТОРНАДО"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
-msgstr ""
+msgstr "Чистое небо"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr ""
+msgstr "Малооблачно"
 
-#: ../src/extension.js:1183
-#, fuzzy
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
-msgstr "Местами ливни"
+msgstr "Рассеянные облака"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
-msgstr ""
+msgstr "Облачность с просветами"
 
-#: ../src/extension.js:1187
-#, fuzzy
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
-msgstr "Облачно"
+msgstr "Сплошная облачность"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Недоступно"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "Штиль"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "Слабый ветер"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "Лёгкий ветер"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "Слабый ветер"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "Умеренный ветер"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "Свежий ветер"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "Сильный ветер"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "Крепкий ветер"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "Очень крепкий ветер"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "Шторм"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "Сильный шторм"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "Жестокий шторм"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Ураган"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Воскресенье"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Понедельник"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Вторник"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Среда"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Четверг"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Пятница"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Суббота"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "С"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "СВ"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "В"
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "ЮВ"
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "Ю"
-
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "ЮЗ"
-
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "З"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr "Неверные данные для поиска \"%s\""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" не найден"
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Город"
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Источник"
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "СЗ"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Удалить %s ?"
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Вчера"
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "по умолчанию"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Редактировать имя"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "Очистить запись"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Редактировать координаты"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "Источник данных о погоде по умолчанию"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Отменить"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Сохранить"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Поиск по названию или координатам"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "Например: Москва, Тверь или -8.5211767,179.1976747"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Найти"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Выбор источника данных о погоде по умолчанию"
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s дней назад"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Персональный API ключ от openweathermap.org"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Сегодня"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Персональный API ключ от forecast.io"
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Завтра"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr "Периодичность обновления текущей погоды [мин.]"
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "В течение %s дней"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Загрузка текущей погоды…"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr "Периодичность обновления прогноза погоды [мин.]"
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Загрузка…"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+"Примечание: периодичность обновления прогноза погоды не используется для "
+"forecast.io, потому что он не поддерживает раздельную загрузку для текущей "
+"погоды и прогноза."
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Подождите"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Персональный API ключ от openweathermap.org"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Влажность:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Источник данных о погоде"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Давление:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr "Выбор источника геоданных"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Ветер:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Персональный AppKey от developer.mapquest.com"
+
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr "Источник геоданных"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Единицы измерения температуры"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Единицы измерения скорости ветра"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "Единицы измерения давления"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Единицы измерения"
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Положение на панели"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "По центру"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Справа"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Слева"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "Отображать направление ветра стрелками"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Переводить погодные условия"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Использовать символические значки"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
-msgstr ""
+msgstr "Текст на кнопках"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Отображать температуру на панели"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Отображать погодные условия на панели"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Отображать погодные условия в прогнозе"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr ""
+msgstr "Центрировать прогноз"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
-msgstr ""
+msgstr "Число дней в прогнозе"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
-msgstr ""
+msgstr "Число знаков после запятой"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "По центру"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Справа"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Слева"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Отображение"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Версия: "
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "неизвестно (собственная сборка ?)"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>Дополнение для отображения сведений о погоде от <a href=\"https://"
+"openweathermap.org/\">Openweathermap</a> или <a href=\"https://forecast.io"
+"\">forecast.io</a> для почти всех мест в мире.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Автор"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Домашняя страница"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
 msgstr ""
+"<span size=\"small\">Эта программа распространяется БЕЗ КАКИХ ЛИБО "
+"ГАРАНТИЙ.\n"
+"Смотри <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, версии 2 или позднее</a> для информации.</"
+"span>"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Название города"
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "О себе"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Удалить %s?"
+#~ msgid "Loading current weather ..."
+#~ msgstr "Загрузка текущей погоды ..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "В течение %s дней"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s дней назад"
+#~ msgstr[1] "%s дней назад"
+#~ msgstr[2] "%s дней назад"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s дней назад"
+#~ msgstr[1] "%s дней назад"
+#~ msgstr[2] "%s дней назад"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "В течение %s дней"
+#~ msgstr[1] "В течение %s дней"
+#~ msgstr[2] "В течение %s дней"
+
+#~ msgid "Name of the city"
+#~ msgstr "Название города"
 
 #~ msgid "Loading future weather ..."
-#~ msgstr "Загрузка прогноза погоды…"
+#~ msgstr "Загрузка прогноза погоды ..."
 
 #~ msgid "Tornado"
 #~ msgstr "Торнадо"
@@ -586,9 +779,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Переменная облачность"
 
-#~ msgid "Clear"
-#~ msgstr "Безоблачно"
-
 #~ msgid "Sunny"
 #~ msgstr "Солнечно"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/sk.po gnome-shell-extension-weather-0~20151114.git609/po/sk.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/sk.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/sk.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,608 +7,690 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
-"PO-Revision-Date: 2012-05-13 22:40+0100\n"
-"Last-Translator: Christian METZLER <neroth@xeked.com>\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-04-24 15:02+0100\n"
+"Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: \n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.5\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr ""
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Nedá sa otvoriť %s"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
-msgstr ""
+msgstr "Umiestnenia"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
-msgstr ""
+msgstr "Znovu načítať informácie o počasí"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr ""
+msgstr "Údaje o počasí získané z:"
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
-msgstr ""
+msgstr "Nedá sa otvoriť %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
-msgstr ""
+msgstr "Nastavenia počasia"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
+msgstr "Neplatné mesto"
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
 msgstr ""
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "Bezvetrie"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "Slabý vánok"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "Slabý vietor"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "Jemný vánok"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "Mierny vietor"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "Čerstvý vietor"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "Silný vietor"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "Mierna víchrica"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "Čerstvá víchrica"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "Silná víchrica"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "Búrka"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "Silná búrka"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Hurikán"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Nedeľa"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Pondelok"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Utorok"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Streda"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Štvrtok"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Piatok"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Sobota"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "SV"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "Z"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "JV"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "J"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "JZ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "Z"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "SZ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Načítava sa ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Prosím, čakajte"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Oblačnosť:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Vlhkosť:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Tlak:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vietor:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Včera"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Pred %d dňom"
+msgstr[1] "Pred %d dňami"
+msgstr[2] "Pred %d dňami"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Dnes"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Zajtra"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "O %d deň"
+msgstr[1] "O %d dni"
+msgstr[2] "O %d dní"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
-msgstr ""
+msgstr "búrka so slabým dažďom"
 
-#: ../src/extension.js:1083
-#, fuzzy
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
-msgstr "Búrky"
+msgstr "búrka s dažďom"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "búrka so silným dažďom"
 
-#: ../src/extension.js:1087
-#, fuzzy
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
-msgstr "Ojedinelé búrky"
+msgstr "slabá búrka"
 
-#: ../src/extension.js:1089
-#, fuzzy
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
-msgstr "Búrky"
+msgstr "búrka"
 
-#: ../src/extension.js:1091
-#, fuzzy
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
-msgstr "Výrazné búrky"
+msgstr "silná búrka"
 
-#: ../src/extension.js:1093
-#, fuzzy
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
-msgstr "Ojedinelé búrky"
+msgstr "ojedinelé búrky"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "búrka so slabým mrholením"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "búrka s mrholením"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "búrka so silným mrholením"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
-msgstr ""
+msgstr "slabé mrholenie"
 
-#: ../src/extension.js:1103
-#, fuzzy
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
-msgstr "Mrholenie"
+msgstr "mrholenie"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "silné mrholenie"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "dážď so slabým mrholením"
 
-#: ../src/extension.js:1109
-#, fuzzy
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
-msgstr "Mrholenie"
+msgstr "dážď s mrholením"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "dážď so silným mrholením"
 
-#: ../src/extension.js:1113
-#, fuzzy
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
-msgstr "Dážď s krúpami"
+msgstr "prehánky s mrholením"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "silné prehánky a mrholenie"
 
-#: ../src/extension.js:1117
-#, fuzzy
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
-msgstr "Mráz a mrholenie"
+msgstr "prehánky s mrholením"
 
-#: ../src/extension.js:1119
-#, fuzzy
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
-msgstr "Mrznúci dážď"
+msgstr "slabý dážď"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
-msgstr ""
+msgstr "mierny dážď"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
-msgstr ""
+msgstr "silný dážď"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
-msgstr ""
+msgstr "veľmi silný dážď"
 
-#: ../src/extension.js:1127
-#, fuzzy
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
-msgstr "Mrznúci dážď"
+msgstr "extrémny dážď"
 
-#: ../src/extension.js:1129
-#, fuzzy
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
-msgstr "Mrznúci dážď"
+msgstr "mrznúci dážď"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "slabé prehánky"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
-msgstr ""
+msgstr "prehánky"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "silné prehánky"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
-msgstr ""
+msgstr "ojedinelé prehánky"
 
-#: ../src/extension.js:1139
-#, fuzzy
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
-msgstr "Husté sneženie"
+msgstr "slabé sneženie"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
-msgstr ""
+msgstr "sneženie"
 
-#: ../src/extension.js:1143
-#, fuzzy
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
-msgstr "Husté sneženie"
+msgstr "silné sneženie"
 
-#: ../src/extension.js:1145
-#, fuzzy
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
-msgstr "Poľadovica"
+msgstr "poľadovica"
 
-#: ../src/extension.js:1147
-#, fuzzy
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
-msgstr "Prehánky"
+msgstr "snehové prehánky s dažďom"
 
-#: ../src/extension.js:1149
-#, fuzzy
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
-msgstr "Dážď so snehom"
+msgstr "slabý dážď so snehom"
 
-#: ../src/extension.js:1151
-#, fuzzy
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
-msgstr "Dážď so snehom"
+msgstr "dážď so snehom"
 
-#: ../src/extension.js:1153
-#, fuzzy
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
-msgstr "Mierne snehové prehánky"
+msgstr "slabé snehové prehánky"
 
-#: ../src/extension.js:1155
-#, fuzzy
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
-msgstr "Prehánky"
+msgstr "snehové prehánky"
 
-#: ../src/extension.js:1157
-#, fuzzy
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
-msgstr "Husté sneženie"
+msgstr "silné snehové prehánky"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
-msgstr ""
+msgstr "hmla"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
-msgstr ""
+msgstr "dym"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
-msgstr ""
+msgstr "opar"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
-msgstr ""
+msgstr "Piesočné/prašné víry"
 
-#: ../src/extension.js:1167
-#, fuzzy
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
-msgstr "Hmlisto"
+msgstr "Hmla"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
-msgstr ""
+msgstr "piesok"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
-msgstr ""
+msgstr "prach"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
-msgstr ""
+msgstr "SOPEČNÝ POPOL"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
-msgstr ""
+msgstr "VÍCHRICE"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
-msgstr ""
+msgstr "TORNÁDO"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
-msgstr ""
+msgstr "jasná obloha"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
-msgstr ""
+msgstr "zopár oblakov"
 
-#: ../src/extension.js:1183
-#, fuzzy
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
-msgstr "Občasné prehánky"
+msgstr "ojedinelá oblačnosť"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
-msgstr ""
+msgstr "potrhaná oblačnosť"
 
-#: ../src/extension.js:1187
-#, fuzzy
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
-msgstr "Zamračené"
+msgstr "zamračené"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Nedostupný"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr ""
+#: ../src/prefs.js:393
+#, fuzzy
+msgid "Location"
+msgstr "Umiestnenia"
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr ""
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Odstrániť %s ?"
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr ""
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Upraviť názov"
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "Vymaže položku"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr ""
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Upraviť súradnice"
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr ""
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr ""
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+#, fuzzy
+msgid "Extensions default weather provider"
+msgstr "Zvoľte poskytovateľa počasia"
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Hurikán"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Nedeľa"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Pondelok"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Utorok"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Streda"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Štvrtok"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Piatok"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Sobota"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr ""
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Vyhľadať podľa súradníc umiestnenia "
 
-#: ../src/extension.js:1273
-msgid "E"
-msgstr ""
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "napr. Vaiaku, Tuvalu alebo -8.5211767,179.1976747"
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
-msgstr ""
+#: ../data/weather-settings.ui:481
+#, fuzzy
+msgid "Chose default weather provider"
+msgstr "Zvoľte poskytovateľa počasia"
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr ""
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Osobný kľúč Api z openweathermap.org"
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr ""
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Osobný kľúč Api z forecast.io"
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Dnes"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Zajtra"
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Osobný kľúč Api z openweathermap.org"
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Načítava sa aktuálne počasie ..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Načítava sa ..."
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Prosím, čakajte"
-
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr ""
+#: ../data/weather-settings.ui:656
+#, fuzzy
+msgid "Weather provider"
+msgstr "Zvoľte poskytovateľa počasia"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Vlhkosť:"
+#: ../data/weather-settings.ui:676
+#, fuzzy
+msgid "Chose geolocation provider"
+msgstr "Zvoľte poskytovateľa počasia"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Tlak:"
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Osobný kľúč Api z forecast.io"
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vietor:"
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Zvoľte poskytovateľa počasia"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Teplota:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
-msgstr ""
+msgstr "Jednotka rýchlosti vetra"
 
-#: ../src/prefs.js:132
-#, fuzzy
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
-msgstr "Tlak:"
-
-#: ../src/prefs.js:134
-msgid "Position in Panel"
-msgstr ""
+msgstr "Jednotka tlaku"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr ""
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Pozícia na paneli"
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
-msgstr ""
+msgstr "Smer vetra indikovať šípkami"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
-msgstr ""
+msgstr "Preložiť podmienky"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
-msgstr ""
+msgstr "Symbolické ikony"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
-msgstr ""
+msgstr "Text na tlačidlách"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Teplota:"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
-msgstr ""
+msgstr "Podmienky v lište"
+
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Podmienky v predpovedi"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr ""
+msgstr "Predpoveď počasia v strede"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
-msgstr ""
+msgstr "Počet dní v predpovedi počasia"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
-msgstr ""
-
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr ""
-
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr ""
-
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr ""
-
-#~ msgid "Loading future weather ..."
-#~ msgstr "Načítava sa predpoveď počasia ..."
-
-#~ msgid "Tornado"
-#~ msgstr "Tornádo"
-
-#~ msgid "Tropical storm"
-#~ msgstr "Tropická búrka"
-
-#~ msgid "Mixed rain and sleet"
-#~ msgstr "Dážď a poľadovica"
-
-#~ msgid "Mixed snow and sleet"
-#~ msgstr "Sneh a poľadovica"
-
-#~ msgid "Snow flurries"
-#~ msgstr "Snehové záveje"
-
-#~ msgid "Snow"
-#~ msgstr "Sneženie"
-
-#~ msgid "Hail"
-#~ msgstr "Krúpy"
+msgstr "Maximálny počet miest po desatinnej čiarke"
 
-#~ msgid "Dust"
-#~ msgstr "Prašno"
-
-#~ msgid "Haze"
-#~ msgstr "Hmla"
-
-#~ msgid "Smoky"
-#~ msgstr "Dym"
-
-#~ msgid "Blustery"
-#~ msgstr "Búrlivo"
-
-#~ msgid "Windy"
-#~ msgstr "Veterno"
-
-#~ msgid "Cold"
-#~ msgstr "Chladno"
-
-#~ msgid "Cloudy"
-#~ msgstr "Oblačno"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "V strede"
 
-#~ msgid "Partly cloudy"
-#~ msgstr "Polojasno"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Vpravo"
 
-#~ msgid "Clear"
-#~ msgstr "Jasno"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Vľavo"
 
-#~ msgid "Sunny"
-#~ msgstr "Slnečno"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr ""
 
-#~ msgid "Fair"
-#~ msgstr "Pekne"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#~ msgid "Hot"
-#~ msgstr "Horúco"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
 
-#~ msgid "Scattered thunderstorms"
-#~ msgstr "Občasné búrky"
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Isolated showers"
-#~ msgstr "Ojedinelé búrky s prehánkami"
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
 
-#~ msgid "Scattered snow showers"
-#~ msgstr "Občasné snehové prehánky"
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
 
-#~ msgid "Thundershowers"
-#~ msgstr "Búrky s prehánkami"
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
 
-#~ msgid "Snow showers"
-#~ msgstr "Snehové prehánky"
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
 
-#~ msgid "Isolated thundershowers"
-#~ msgstr "Ojedinelé búrky s prehánkami"
+#~ msgid "Loading current weather ..."
+#~ msgstr "Načítava sa aktuálne počasie ..."
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/sr@latin.po gnome-shell-extension-weather-0~20151114.git609/po/sr@latin.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/sr@latin.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/sr@latin.po	2015-11-17 15:10:32.000000000 +0000
@@ -0,0 +1,699 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-07-29 02:08+0200\n"
+"Last-Translator: Slobodan Terzić <Xabre@archlinux.info>\n"
+"Language-Team: \n"
+"Language: sr@latin\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.2\n"
+
+#: ../src/extension.js:172
+msgid "..."
+msgstr "..."
+
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Ne mogu da otvorim %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
+msgid "Locations"
+msgstr "Lokacije"
+
+#: ../src/extension.js:788
+msgid "Reload Weather Information"
+msgstr "Ponovo učitaj podatke o vremenu"
+
+#: ../src/extension.js:803
+msgid "Weather data provided by:"
+msgstr "Podatke o vremenu dostavlja:"
+
+#: ../src/extension.js:814
+#, javascript-format
+msgid "Can not open %s"
+msgstr "Ne mogu da otvorim %s"
+
+#: ../src/extension.js:821
+msgid "Weather Settings"
+msgstr "Postavke vremena"
+
+#: ../src/extension.js:872 ../src/prefs.js:1021
+msgid "Invalid city"
+msgstr "neispravan grad"
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "neispravna lokacija! Pokušajte da je ponovo napravite."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "vedro"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "lagan vazduh"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "lagan povetarac"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "nežan povetarac"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "umeren povetarac"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "svež povetarac"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "jak povetarac"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "umerena bura"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "sveža bura"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "jaka bura"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "oluja"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "razorna oluja"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "uragan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "nedelja"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "ponedeljak"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "utorak"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "sreda"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "četvrtak"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "petak"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "subota"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "S"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "SI"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "I"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "JI"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "J"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "JZ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "Z"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "SZ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Učitavanje..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Sačekajte"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Oblačnost:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Vlažnost vazduha:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Pritisak:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vetar:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "juče"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "pre %d dan"
+msgstr[1] "pre %d dana"
+msgstr[2] "pre %d dana"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "danas"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "sutra"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "za %d dan"
+msgstr[1] "za %d dana"
+msgstr[2] "za %d dana"
+
+#: ../src/openweathermap_org.js:181
+msgid "thunderstorm with light rain"
+msgstr "grmljavina sa lakom kišom"
+
+#: ../src/openweathermap_org.js:183
+msgid "thunderstorm with rain"
+msgstr "grmljavina sa kišom"
+
+#: ../src/openweathermap_org.js:185
+msgid "thunderstorm with heavy rain"
+msgstr "grmljavina sa jakom kišom"
+
+#: ../src/openweathermap_org.js:187
+msgid "light thunderstorm"
+msgstr "laka grmljavina"
+
+#: ../src/openweathermap_org.js:189
+msgid "thunderstorm"
+msgstr "grmljavina"
+
+#: ../src/openweathermap_org.js:191
+msgid "heavy thunderstorm"
+msgstr "jaka grmljavina"
+
+#: ../src/openweathermap_org.js:193
+msgid "ragged thunderstorm"
+msgstr "mestimična grmljavina"
+
+#: ../src/openweathermap_org.js:195
+msgid "thunderstorm with light drizzle"
+msgstr "grmljavina sa lakim rominjanjem"
+
+#: ../src/openweathermap_org.js:197
+msgid "thunderstorm with drizzle"
+msgstr "grmljavina sa rominjanjem"
+
+#: ../src/openweathermap_org.js:199
+msgid "thunderstorm with heavy drizzle"
+msgstr "grmljavina sa jakim rominjanjem"
+
+#: ../src/openweathermap_org.js:201
+msgid "light intensity drizzle"
+msgstr "rominjanje lakog inteziteta"
+
+#: ../src/openweathermap_org.js:203
+msgid "drizzle"
+msgstr "rominjanje"
+
+#: ../src/openweathermap_org.js:205
+msgid "heavy intensity drizzle"
+msgstr "rominjanje jakog inteziteta"
+
+#: ../src/openweathermap_org.js:207
+msgid "light intensity drizzle rain"
+msgstr "rominjava kiša lakog inteziteta"
+
+#: ../src/openweathermap_org.js:209
+msgid "drizzle rain"
+msgstr "rominjava kiša"
+
+#: ../src/openweathermap_org.js:211
+msgid "heavy intensity drizzle rain"
+msgstr "rominjava kiša jaog inteziteta"
+
+#: ../src/openweathermap_org.js:213
+msgid "shower rain and drizzle"
+msgstr "pljusak i rominjanje"
+
+#: ../src/openweathermap_org.js:215
+msgid "heavy shower rain and drizzle"
+msgstr "jak pljusak i rominjanje"
+
+#: ../src/openweathermap_org.js:217
+msgid "shower drizzle"
+msgstr "rominjav pljusak"
+
+#: ../src/openweathermap_org.js:219
+msgid "light rain"
+msgstr "lagana kiša"
+
+#: ../src/openweathermap_org.js:221
+msgid "moderate rain"
+msgstr "umerena kiša"
+
+#: ../src/openweathermap_org.js:223
+msgid "heavy intensity rain"
+msgstr "kiša jakog inteziteta"
+
+#: ../src/openweathermap_org.js:225
+msgid "very heavy rain"
+msgstr "vrlo jaka kiša"
+
+#: ../src/openweathermap_org.js:227
+msgid "extreme rain"
+msgstr "ekstremna kiša"
+
+#: ../src/openweathermap_org.js:229
+msgid "freezing rain"
+msgstr "ledena kiša"
+
+#: ../src/openweathermap_org.js:231
+msgid "light intensity shower rain"
+msgstr "pljusak lakog inteziteta"
+
+#: ../src/openweathermap_org.js:233
+msgid "shower rain"
+msgstr "pljusak"
+
+#: ../src/openweathermap_org.js:235
+msgid "heavy intensity shower rain"
+msgstr "pljusak jakog inteziteta"
+
+#: ../src/openweathermap_org.js:237
+msgid "ragged shower rain"
+msgstr "mestimični pljuskovi"
+
+#: ../src/openweathermap_org.js:239
+msgid "light snow"
+msgstr "lagan sneg"
+
+#: ../src/openweathermap_org.js:241
+msgid "snow"
+msgstr "sneg"
+
+#: ../src/openweathermap_org.js:243
+msgid "heavy snow"
+msgstr "jak sneg"
+
+#: ../src/openweathermap_org.js:245
+msgid "sleet"
+msgstr "susnežica"
+
+#: ../src/openweathermap_org.js:247
+msgid "shower sleet"
+msgstr "pljušteća susnežica"
+
+#: ../src/openweathermap_org.js:249
+msgid "light rain and snow"
+msgstr "lagana kiša i sneg"
+
+#: ../src/openweathermap_org.js:251
+msgid "rain and snow"
+msgstr "kiša i sneg"
+
+#: ../src/openweathermap_org.js:253
+msgid "light shower snow"
+msgstr "lagan pljušteći sneg"
+
+#: ../src/openweathermap_org.js:255
+msgid "shower snow"
+msgstr "pljušteći sneg"
+
+#: ../src/openweathermap_org.js:257
+msgid "heavy shower snow"
+msgstr "jak pljušteći sneg"
+
+#: ../src/openweathermap_org.js:259
+msgid "mist"
+msgstr "magla"
+
+#: ../src/openweathermap_org.js:261
+msgid "smoke"
+msgstr "dim"
+
+#: ../src/openweathermap_org.js:263
+msgid "haze"
+msgstr "izmaglica"
+
+#: ../src/openweathermap_org.js:265
+msgid "Sand/Dust Whirls"
+msgstr "Vihori peska/prašine"
+
+#: ../src/openweathermap_org.js:267
+msgid "Fog"
+msgstr "magla"
+
+#: ../src/openweathermap_org.js:269
+msgid "sand"
+msgstr "pesak"
+
+#: ../src/openweathermap_org.js:271
+msgid "dust"
+msgstr "prašina"
+
+#: ../src/openweathermap_org.js:273
+msgid "VOLCANIC ASH"
+msgstr "VULKANSKI PEPEO"
+
+#: ../src/openweathermap_org.js:275
+msgid "SQUALLS"
+msgstr "NALETI VETRA"
+
+#: ../src/openweathermap_org.js:277
+msgid "TORNADO"
+msgstr "TORNADO"
+
+#: ../src/openweathermap_org.js:279
+msgid "sky is clear"
+msgstr "vedro nebo"
+
+#: ../src/openweathermap_org.js:281
+msgid "few clouds"
+msgstr "par oblaka"
+
+#: ../src/openweathermap_org.js:283
+msgid "scattered clouds"
+msgstr "raštrkani oblaci"
+
+#: ../src/openweathermap_org.js:285
+msgid "broken clouds"
+msgstr "mestimični oblaci"
+
+#: ../src/openweathermap_org.js:287
+msgid "overcast clouds"
+msgstr "tmurni oblaci"
+
+#: ../src/openweathermap_org.js:289
+msgid "Not available"
+msgstr "nije dostupno"
+
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "„%s“ nije nađeno"
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Lokacija"
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Dostavljač"
+
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Ukloniti %s ?"
+
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "podrazumevano"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Uređivanje imena"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "očisti unos"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Uređivanje koordinata"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "Podrazumevani dostavljač podataka o vremenu za proširenje"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Sačuvaj"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Pretraga po lokaciji ili koordinatama"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "npr. Beograd, Srbija ili 44.816667,20.466667"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Nađi"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Izaberite podrazumevanog dostavljača"
+
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Lični api ključ sa openweathermap.org"
+
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Lični api ključ sa forecast.io"
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
+
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Lični api ključ sa openweathermap.org"
+
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
+
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Dostavljač podataka o vremenu"
+
+#: ../data/weather-settings.ui:676
+#, fuzzy
+msgid "Chose geolocation provider"
+msgstr "Izaberite podrazumevanog dostavljača"
+
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Lični api ključ sa forecast.io"
+
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Dostavljač podataka o vremenu"
+
+#: ../data/weather-settings.ui:751
+msgid "Temperature Unit"
+msgstr "Mera temperature"
+
+#: ../data/weather-settings.ui:762
+msgid "Wind Speed Unit"
+msgstr "Mera brzine vetra"
+
+#: ../data/weather-settings.ui:773
+msgid "Pressure Unit"
+msgstr "Mera pritiska"
+
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Mere"
+
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Pozicija na panelu"
+
+#: ../data/weather-settings.ui:880
+msgid "Wind Direction by Arrows"
+msgstr "Smer vetra pomoću strelica"
+
+#: ../data/weather-settings.ui:891
+msgid "Translate Conditions"
+msgstr "Prevod uslova"
+
+#: ../data/weather-settings.ui:902
+msgid "Symbolic Icons"
+msgstr "Simbolične ikone"
+
+#: ../data/weather-settings.ui:913
+msgid "Text on buttons"
+msgstr "Tekst na dugmadima"
+
+#: ../data/weather-settings.ui:924
+msgid "Temperature in Panel"
+msgstr "Temperatura na panelu"
+
+#: ../data/weather-settings.ui:935
+msgid "Conditions in Panel"
+msgstr "Uslovi na panelu"
+
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Uslovi u prognozi"
+
+#: ../data/weather-settings.ui:957
+msgid "Center forecast"
+msgstr "Centriranje prognoze"
+
+#: ../data/weather-settings.ui:968
+msgid "Number of days in forecast"
+msgstr "Broj dana u prognozi"
+
+#: ../data/weather-settings.ui:979
+msgid "Maximal number of digits after the decimal point"
+msgstr "Maksimalan br. cifara nakon decimalnog zareza"
+
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "sredina"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "desno"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "levo"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Raspored"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Verzija:"
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "nepoznata (samogradnja?)"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>Proširenje za prikaz podataka o vremenu sa <a href=\"https://"
+"openweathermap.org/\">Openweathermap</a> ili <a href=\"https://forecast.io"
+"\">forecast.io</a> za skoro sve lokacije u svetu.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Održava"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Web stranica"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">Ovaj program se dostavlja BEZ IKAKVIH GARANCIJA.\n"
+"Pogledajte <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNUovu Opštu Javnu licencu, verzija 2 ili kasnija</a>, za detalje.</span>"
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "O programu"
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Učitavanje trenutnog vremena..."
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/sr.po gnome-shell-extension-weather-0~20151114.git609/po/sr.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/sr.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/sr.po	2015-11-17 15:10:32.000000000 +0000
@@ -0,0 +1,699 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-07-29 02:04+0200\n"
+"Last-Translator: Слободан Терзић <Xabre@archlinux.info>\n"
+"Language-Team: \n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.2\n"
+
+#: ../src/extension.js:172
+msgid "..."
+msgstr "..."
+
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, fuzzy, javascript-format
+msgid "Can not connect to %s"
+msgstr "Не могу да отворим %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
+msgid "Locations"
+msgstr "Локације"
+
+#: ../src/extension.js:788
+msgid "Reload Weather Information"
+msgstr "Поново учитај податке о времену"
+
+#: ../src/extension.js:803
+msgid "Weather data provided by:"
+msgstr "Податке о времену доставља:"
+
+#: ../src/extension.js:814
+#, javascript-format
+msgid "Can not open %s"
+msgstr "Не могу да отворим %s"
+
+#: ../src/extension.js:821
+msgid "Weather Settings"
+msgstr "Поставке времена"
+
+#: ../src/extension.js:872 ../src/prefs.js:1021
+msgid "Invalid city"
+msgstr "неисправан град"
+
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "неисправна локација! Покушајте да је поново направите."
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "ведро"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "лаган ваздух"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "лаган поветарац"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "нежан поветарац"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "умерен поветарац"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "свеж поветарац"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "јак поветарац"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "умерена бура"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "свежа бура"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "јака бура"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "олуја"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "разорна олуја"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "ураган"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "недеља"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "понедељак"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "уторак"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "среда"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "четвртак"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "петак"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "субота"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "С"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "СИ"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "И"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "ЈИ"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "Ј"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "ЈЗ"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "З"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "СЗ"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Учитавање..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Сачекајте"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "Облачност:"
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Влажност ваздуха:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Притисак:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Ветар:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "јуче"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "пре %d дан"
+msgstr[1] "пре %d дана"
+msgstr[2] "пре %d дана"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "данас"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "сутра"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "за %d дан"
+msgstr[1] "за %d дана"
+msgstr[2] "за %d дана"
+
+#: ../src/openweathermap_org.js:181
+msgid "thunderstorm with light rain"
+msgstr "грмљавина са лаком кишом"
+
+#: ../src/openweathermap_org.js:183
+msgid "thunderstorm with rain"
+msgstr "грмљавина са кишом"
+
+#: ../src/openweathermap_org.js:185
+msgid "thunderstorm with heavy rain"
+msgstr "грмљавина са јаком кишом"
+
+#: ../src/openweathermap_org.js:187
+msgid "light thunderstorm"
+msgstr "лака грмљавина"
+
+#: ../src/openweathermap_org.js:189
+msgid "thunderstorm"
+msgstr "грмљавина"
+
+#: ../src/openweathermap_org.js:191
+msgid "heavy thunderstorm"
+msgstr "јака грмљавина"
+
+#: ../src/openweathermap_org.js:193
+msgid "ragged thunderstorm"
+msgstr "местимична грмљавина"
+
+#: ../src/openweathermap_org.js:195
+msgid "thunderstorm with light drizzle"
+msgstr "грмљавина са лаким ромињањем"
+
+#: ../src/openweathermap_org.js:197
+msgid "thunderstorm with drizzle"
+msgstr "грмљавина са ромињањем"
+
+#: ../src/openweathermap_org.js:199
+msgid "thunderstorm with heavy drizzle"
+msgstr "грмљавина са јаким ромињањем"
+
+#: ../src/openweathermap_org.js:201
+msgid "light intensity drizzle"
+msgstr "ромињање лаког интезитета"
+
+#: ../src/openweathermap_org.js:203
+msgid "drizzle"
+msgstr "ромињање"
+
+#: ../src/openweathermap_org.js:205
+msgid "heavy intensity drizzle"
+msgstr "ромињање јаког интезитета"
+
+#: ../src/openweathermap_org.js:207
+msgid "light intensity drizzle rain"
+msgstr "ромињава киша лаког интезитета"
+
+#: ../src/openweathermap_org.js:209
+msgid "drizzle rain"
+msgstr "ромињава киша"
+
+#: ../src/openweathermap_org.js:211
+msgid "heavy intensity drizzle rain"
+msgstr "ромињава киша јаог интезитета"
+
+#: ../src/openweathermap_org.js:213
+msgid "shower rain and drizzle"
+msgstr "пљусак и ромињање"
+
+#: ../src/openweathermap_org.js:215
+msgid "heavy shower rain and drizzle"
+msgstr "јак пљусак и ромињање"
+
+#: ../src/openweathermap_org.js:217
+msgid "shower drizzle"
+msgstr "ромињав пљусак"
+
+#: ../src/openweathermap_org.js:219
+msgid "light rain"
+msgstr "лагана киша"
+
+#: ../src/openweathermap_org.js:221
+msgid "moderate rain"
+msgstr "умерена киша"
+
+#: ../src/openweathermap_org.js:223
+msgid "heavy intensity rain"
+msgstr "киша јаког интезитета"
+
+#: ../src/openweathermap_org.js:225
+msgid "very heavy rain"
+msgstr "врло јака киша"
+
+#: ../src/openweathermap_org.js:227
+msgid "extreme rain"
+msgstr "екстремна киша"
+
+#: ../src/openweathermap_org.js:229
+msgid "freezing rain"
+msgstr "ледена киша"
+
+#: ../src/openweathermap_org.js:231
+msgid "light intensity shower rain"
+msgstr "пљусак лаког интезитета"
+
+#: ../src/openweathermap_org.js:233
+msgid "shower rain"
+msgstr "пљусак"
+
+#: ../src/openweathermap_org.js:235
+msgid "heavy intensity shower rain"
+msgstr "пљусак јаког интезитета"
+
+#: ../src/openweathermap_org.js:237
+msgid "ragged shower rain"
+msgstr "местимични пљускови"
+
+#: ../src/openweathermap_org.js:239
+msgid "light snow"
+msgstr "лаган снег"
+
+#: ../src/openweathermap_org.js:241
+msgid "snow"
+msgstr "снег"
+
+#: ../src/openweathermap_org.js:243
+msgid "heavy snow"
+msgstr "јак снег"
+
+#: ../src/openweathermap_org.js:245
+msgid "sleet"
+msgstr "суснежица"
+
+#: ../src/openweathermap_org.js:247
+msgid "shower sleet"
+msgstr "пљуштећа суснежица"
+
+#: ../src/openweathermap_org.js:249
+msgid "light rain and snow"
+msgstr "лагана киша и снег"
+
+#: ../src/openweathermap_org.js:251
+msgid "rain and snow"
+msgstr "киша и снег"
+
+#: ../src/openweathermap_org.js:253
+msgid "light shower snow"
+msgstr "лаган пљуштећи снег"
+
+#: ../src/openweathermap_org.js:255
+msgid "shower snow"
+msgstr "пљуштећи снег"
+
+#: ../src/openweathermap_org.js:257
+msgid "heavy shower snow"
+msgstr "јак пљуштећи снег"
+
+#: ../src/openweathermap_org.js:259
+msgid "mist"
+msgstr "магла"
+
+#: ../src/openweathermap_org.js:261
+msgid "smoke"
+msgstr "дим"
+
+#: ../src/openweathermap_org.js:263
+msgid "haze"
+msgstr "измаглица"
+
+#: ../src/openweathermap_org.js:265
+msgid "Sand/Dust Whirls"
+msgstr "Вихори песка/прашине"
+
+#: ../src/openweathermap_org.js:267
+msgid "Fog"
+msgstr "магла"
+
+#: ../src/openweathermap_org.js:269
+msgid "sand"
+msgstr "песак"
+
+#: ../src/openweathermap_org.js:271
+msgid "dust"
+msgstr "прашина"
+
+#: ../src/openweathermap_org.js:273
+msgid "VOLCANIC ASH"
+msgstr "ВУЛКАНСКИ ПЕПЕО"
+
+#: ../src/openweathermap_org.js:275
+msgid "SQUALLS"
+msgstr "НАЛЕТИ ВЕТРА"
+
+#: ../src/openweathermap_org.js:277
+msgid "TORNADO"
+msgstr "ТОРНАДО"
+
+#: ../src/openweathermap_org.js:279
+msgid "sky is clear"
+msgstr "ведро небо"
+
+#: ../src/openweathermap_org.js:281
+msgid "few clouds"
+msgstr "пар облака"
+
+#: ../src/openweathermap_org.js:283
+msgid "scattered clouds"
+msgstr "раштркани облаци"
+
+#: ../src/openweathermap_org.js:285
+msgid "broken clouds"
+msgstr "местимични облаци"
+
+#: ../src/openweathermap_org.js:287
+msgid "overcast clouds"
+msgstr "тмурни облаци"
+
+#: ../src/openweathermap_org.js:289
+msgid "Not available"
+msgstr "није доступно"
+
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr ""
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "„%s“ није нађено"
+
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "Локација"
+
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "Достављач"
+
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Уклонити %s ?"
+
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "подразумевано"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "Уређивање имена"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "очисти унос"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "Уређивање координата"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "Подразумевани достављач података о времену за проширење"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "Откажи"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "Сачувај"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "Претрага по локацији или координатама"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "нпр. Београд, Србија или 44.816667,20.466667"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "Нађи"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "Изаберите подразумеваног достављача"
+
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "Лични апи кључ са openweathermap.org"
+
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "Лични апи кључ са forecast.io"
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
+
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "Лични апи кључ са openweathermap.org"
+
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
+
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "Достављач података о времену"
+
+#: ../data/weather-settings.ui:676
+#, fuzzy
+msgid "Chose geolocation provider"
+msgstr "Изаберите подразумеваног достављача"
+
+#: ../data/weather-settings.ui:702
+#, fuzzy
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "Лични апи кључ са forecast.io"
+
+#: ../data/weather-settings.ui:731
+#, fuzzy
+msgid "Geolocation provider"
+msgstr "Достављач података о времену"
+
+#: ../data/weather-settings.ui:751
+msgid "Temperature Unit"
+msgstr "Мера температуре"
+
+#: ../data/weather-settings.ui:762
+msgid "Wind Speed Unit"
+msgstr "Мера брзине ветра"
+
+#: ../data/weather-settings.ui:773
+msgid "Pressure Unit"
+msgstr "Мера притиска"
+
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "Мере"
+
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
+msgstr "Позиција на панелу"
+
+#: ../data/weather-settings.ui:880
+msgid "Wind Direction by Arrows"
+msgstr "Смер ветра помоћу стрелица"
+
+#: ../data/weather-settings.ui:891
+msgid "Translate Conditions"
+msgstr "Превод услова"
+
+#: ../data/weather-settings.ui:902
+msgid "Symbolic Icons"
+msgstr "Симболичне иконе"
+
+#: ../data/weather-settings.ui:913
+msgid "Text on buttons"
+msgstr "Текст на дугмадима"
+
+#: ../data/weather-settings.ui:924
+msgid "Temperature in Panel"
+msgstr "Температура на панелу"
+
+#: ../data/weather-settings.ui:935
+msgid "Conditions in Panel"
+msgstr "Услови на панелу"
+
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "Услови у прогнози"
+
+#: ../data/weather-settings.ui:957
+msgid "Center forecast"
+msgstr "Центрирање прогнозе"
+
+#: ../data/weather-settings.ui:968
+msgid "Number of days in forecast"
+msgstr "Број дана у прогнози"
+
+#: ../data/weather-settings.ui:979
+msgid "Maximal number of digits after the decimal point"
+msgstr "Максималан бр. цифара након децималног зареза"
+
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "средина"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "десно"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "лево"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "Распоред"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "Верзија:"
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "непозната (самоградња?)"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>Проширење за приказ података о времену са <a href=\"https://"
+"openweathermap.org/\">Openweathermap</a> или <a href=\"https://forecast.io"
+"\">forecast.io</a> за скоро све локације у свету.</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "Одржава"
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "Беб страница"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">Овај програм се доставља БЕЗ ИКАКВИХ ГАРАНЦИЈА.\n"
+"Погледајте <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">ГНУову Општу Јавну лиценцу, верзија 2 или каснија</a>, за детаље.</span>"
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "О програму"
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Учитавање тренутног времена..."
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/sv.po gnome-shell-extension-weather-0~20151114.git609/po/sv.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/sv.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/sv.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:40+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: \n"
@@ -16,524 +16,714 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr ""
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr ""
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Orkan"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Söndag"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Måndag"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Tisdag"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Fredag"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Lördag"
+
+#: ../src/extension.js:1028
+msgid "N"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Laddar..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Vänligen vänta"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Fuktighet:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Lufttryck:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Vind:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Idag"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Imorgon"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Åska"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Åska"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Åska"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Lokal åska"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Åska"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Kraftig åska"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Lokal åska"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Åska"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Åska"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Åska"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Duggregn"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Regn och hagel"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Duggregn"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Duggregn"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Duggregn"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Regn och hagel"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Regn och hagel"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Underkylt duggregn"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Underkylt regn"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Duggregn"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Underkylt regn"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Underkylt regn"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Lätta snöbyar"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Regnskurar"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Häftigt snöfall"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Snöstorm"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Häftigt snöfall"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Slask"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Regnskurar"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Snöblandat regn"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Snöblandat regn"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Lätta snöbyar"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Regnskurar"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Häftigt snöfall"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Dimma"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Mestadels molnigt"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Utspridda regnskurar"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Mestadels molnigt"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Mestadels molnigt"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Inte tillgänglig"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Klart"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Orkan"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Söndag"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Måndag"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Tisdag"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Fredag"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Lördag"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Idag"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Imorgon"
-
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Laddar nuvarande väder..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Laddar..."
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Vänligen vänta"
-
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Fuktighet:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Lufttryck:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Vind:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Temperatur:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr ""
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Lufttryck:"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Left"
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
 msgstr ""
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr ""
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr ""
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Temperatur:"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr ""
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr ""
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
+#: ../data/weather-settings.ui:993
+msgid "Left"
 msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Laddar nuvarande väder..."
+
 #~ msgid "Loading future weather ..."
 #~ msgstr "Laddar kommande väder..."
 
@@ -582,9 +772,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Delvis molnigt"
 
-#~ msgid "Clear"
-#~ msgstr "Klart"
-
 #~ msgid "Sunny"
 #~ msgstr "Soligt"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/uk.po gnome-shell-extension-weather-0~20151114.git609/po/uk.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/uk.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/uk.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-05-13 22:41+0100\n"
 "Last-Translator: Christian METZLER <neroth@xeked.com>\n"
 "Language-Team: \n"
@@ -16,524 +16,714 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
 msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr ""
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr ""
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr ""
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr ""
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Ураган"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Неділя"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Понеділок"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Вівторок"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Середа"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Четвер"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "П’ятниця"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Субота"
+
+#: ../src/extension.js:1028
+msgid "N"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr ""
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr ""
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Завантаження ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Зачекайте"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Вологість:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Тиск:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Вітер:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Сьогодні"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Завтра"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Грози"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Грози"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Грози"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Поодинокі грози"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Грози"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Сильні грози"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Поодинокі грози"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Грози"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Грози"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Грози"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Мжичка"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Дощ і град"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Мжичка"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Мжичка"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Мжичка"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Дощ і град"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Дощ і град"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Паморозь"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Льодяний дощ"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Мжичка"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Льодяний дощ"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Льодяний дощ"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Невеликий снігопад"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Зливи"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Сильний снігопад"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Низова завірюха"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Сильний снігопад"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Мокрий сніг"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Зливи"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Дощ та сніг"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Дощ та сніг"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Невеликий снігопад"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Зливи"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Сильний снігопад"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Туман"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Переважно хмарно"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Місцями зливи"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Переважно хмарно"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Переважно хмарно"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Недоступно"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
 msgstr ""
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
 msgstr ""
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Безхмарно"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Ураган"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Неділя"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Понеділок"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Вівторок"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Середа"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Четвер"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "П’ятниця"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Субота"
-
-#: ../src/extension.js:1273
-msgid "N"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NE"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "E"
+#: ../data/weather-settings.ui:230
+msgid "Find"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SE"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "S"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
 msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
 msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
 msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
 msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Сьогодні"
-
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Завтра"
-
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
 msgstr ""
 
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Завантаження поточної погоди ..."
-
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Завантаження ..."
-
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Зачекайте"
-
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Вологість:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Тиск:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Вітер:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Температура:"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr ""
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Тиск:"
 
-#: ../src/prefs.js:134
-msgid "Position in Panel"
+#: ../data/weather-settings.ui:849
+msgid "Units"
 msgstr ""
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr ""
-
-#: ../src/prefs.js:135
-msgid "Left"
+#: ../data/weather-settings.ui:869
+msgid "Position in Panel"
 msgstr ""
 
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr ""
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr ""
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Температура:"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr ""
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr ""
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr ""
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
+#: ../data/weather-settings.ui:993
+msgid "Left"
 msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Завантаження поточної погоди ..."
+
 #~ msgid "Loading future weather ..."
 #~ msgstr "Завантаження прогнозу погоди ..."
 
@@ -582,9 +772,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Невелика хмарність"
 
-#~ msgid "Clear"
-#~ msgstr "Безхмарно"
-
 #~ msgid "Sunny"
 #~ msgstr "Сонячно"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/update.js gnome-shell-extension-weather-0~20151114.git609/po/update.js
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/update.js	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/update.js	2015-11-17 15:10:32.000000000 +0000
@@ -4,9 +4,11 @@
  *
  *  PO Updater for GNOME Shell Extension Weather
  *
- * Copyright (C) 2012 -2014
+ * Copyright (C) 2012 -2013
  *     Christian METZLER <neroth@xeked.com>
  *     Jens Lody <jens@jenslody.de>,
+ * Copyright (C) 2014 -2015
+ *     Jens Lody <jens@jenslody.de>,
  *
  *
  * This file is part of gnome-shell-extension-openweather.
@@ -29,7 +31,7 @@
 Gio = imports.gi.Gio;
 
 print("Generate gnome-shell-extension-openweather.pot");
-var xgettext = Seed.spawn("xgettext -o gnome-shell-extension-openweather.pot -L python --from-code=utf-8 --keyword=_ -f POTFILES.in");
+var xgettext = Seed.spawn("xgettext -o gnome-shell-extension-openweather.pot --from-code=utf-8 --keyword=_ --keyword=translatable -f POTFILES.in");
 
 if (xgettext.stderr)
     print(xgettext.stderr);
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/vi.po gnome-shell-extension-weather-0~20151114.git609/po/vi.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/vi.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/vi.po	2015-11-17 15:10:32.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
 "PO-Revision-Date: 2012-06-17 17:04+0700\n"
 "Last-Translator: Ngô Trung <ndtrung4419@gmail.com>\n"
 "Language-Team: \n"
@@ -17,523 +17,734 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "Không tìm thấy schema \"%s\"."
+#: ../src/extension.js:370
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr ""
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr ""
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "Tải lại dữ liệu thời tiết"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr ""
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr ""
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "Thiết lập thời tiết"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "Không có thành phố này"
 
-#: ../src/extension.js:1081
-msgid "thunderstorm with light rain"
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr ""
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr ""
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr ""
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr ""
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr ""
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr ""
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr ""
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr ""
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr ""
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr ""
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr ""
+
+#: ../src/extension.js:1012
+msgid "Storm"
 msgstr ""
 
-#: ../src/extension.js:1083
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr ""
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "Cuồng phong"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "Chủ Nhật"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "Thứ hai"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "Thứ ba"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "Thứ tư"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "Thứ năm"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "Thứ sáu"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "Thứ bảy"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "B"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "ĐB"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "Đ"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "ĐN"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "N"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "TN"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "T"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "TB"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "Đang tải..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "Xin đợi một lát"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr ""
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "Độ ẩm:"
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "Áp suất:"
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "Gió:"
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "Hôm qua"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, fuzzy, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%s ngày trước"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "Hôm nay"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "Ngày mai"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, fuzzy, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "%s ngày trước"
+
+#: ../src/openweathermap_org.js:181
+#, fuzzy
+msgid "thunderstorm with light rain"
+msgstr "Giông"
+
+#: ../src/openweathermap_org.js:183
 #, fuzzy
 msgid "thunderstorm with rain"
 msgstr "Giông"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
+#, fuzzy
 msgid "thunderstorm with heavy rain"
-msgstr ""
+msgstr "Giông"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 #, fuzzy
 msgid "light thunderstorm"
 msgstr "Giông diện hẹp"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 #, fuzzy
 msgid "thunderstorm"
 msgstr "Giông"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 #, fuzzy
 msgid "heavy thunderstorm"
 msgstr "Giông nguy hiểm"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 #, fuzzy
 msgid "ragged thunderstorm"
 msgstr "Giông diện hẹp"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
+#, fuzzy
 msgid "thunderstorm with light drizzle"
-msgstr ""
+msgstr "Giông"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
+#, fuzzy
 msgid "thunderstorm with drizzle"
-msgstr ""
+msgstr "Giông"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
+#, fuzzy
 msgid "thunderstorm with heavy drizzle"
-msgstr ""
+msgstr "Giông"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr ""
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 #, fuzzy
 msgid "drizzle"
 msgstr "Mưa phùn"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
+#, fuzzy
 msgid "heavy intensity drizzle"
-msgstr ""
+msgstr "Mưa và mưa đá"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
+#, fuzzy
 msgid "light intensity drizzle rain"
-msgstr ""
+msgstr "Mưa phùn"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 #, fuzzy
 msgid "drizzle rain"
 msgstr "Mưa phùn"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
+#, fuzzy
 msgid "heavy intensity drizzle rain"
-msgstr ""
+msgstr "Mưa phùn"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 #, fuzzy
 msgid "shower rain and drizzle"
 msgstr "Mưa và mưa đá"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
+#, fuzzy
 msgid "heavy shower rain and drizzle"
-msgstr ""
+msgstr "Mưa và mưa đá"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 #, fuzzy
 msgid "shower drizzle"
 msgstr "Mưa phùn rét"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 #, fuzzy
 msgid "light rain"
 msgstr "Mưa rét"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
+#, fuzzy
 msgid "moderate rain"
-msgstr ""
+msgstr "Mưa phùn"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr ""
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr ""
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 #, fuzzy
 msgid "extreme rain"
 msgstr "Mưa rét"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 #, fuzzy
 msgid "freezing rain"
 msgstr "Mưa rét"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
+#, fuzzy
 msgid "light intensity shower rain"
-msgstr ""
+msgstr "Tuyết rào nhẹ"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
+#, fuzzy
 msgid "shower rain"
-msgstr ""
+msgstr "Mưa rào"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
+#, fuzzy
 msgid "heavy intensity shower rain"
-msgstr ""
+msgstr "Tuyết mạnh"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr ""
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 #, fuzzy
 msgid "light snow"
 msgstr "Gió tuyết"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr ""
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 #, fuzzy
 msgid "heavy snow"
 msgstr "Tuyết mạnh"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 #, fuzzy
 msgid "sleet"
 msgstr "Mưa tuyết"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 #, fuzzy
 msgid "shower sleet"
 msgstr "Mưa rào"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 #, fuzzy
 msgid "light rain and snow"
 msgstr "Mưa và tuyết"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 #, fuzzy
 msgid "rain and snow"
 msgstr "Mưa và tuyết"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 #, fuzzy
 msgid "light shower snow"
 msgstr "Tuyết rào nhẹ"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 #, fuzzy
 msgid "shower snow"
 msgstr "Mưa rào"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 #, fuzzy
 msgid "heavy shower snow"
 msgstr "Tuyết mạnh"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr ""
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr ""
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr ""
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr ""
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 #, fuzzy
 msgid "Fog"
 msgstr "Sương mù"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr ""
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr ""
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr ""
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr ""
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr ""
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr ""
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
+#, fuzzy
 msgid "few clouds"
-msgstr ""
+msgstr "Nhiều mây"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 #, fuzzy
 msgid "scattered clouds"
 msgstr "Mưa rào rải rác"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
+#, fuzzy
 msgid "broken clouds"
-msgstr ""
+msgstr "Nhiều mây"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 #, fuzzy
 msgid "overcast clouds"
 msgstr "Nhiều mây"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "Không có dữ liệu"
 
-#: ../src/extension.js:1227
-msgid "Calm"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
 msgstr ""
 
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr ""
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, fuzzy, javascript-format
+msgid "\"%s\" not found"
+msgstr "Không tìm thấy schema \"%s\"."
 
-#: ../src/extension.js:1233
-msgid "Light breeze"
+#: ../src/prefs.js:393
+msgid "Location"
 msgstr ""
 
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
+#: ../src/prefs.js:403
+msgid "Provider"
 msgstr ""
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr ""
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "Bạn có muốn xóa %s?"
 
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
+#: ../src/prefs.js:1056
+msgid "default"
 msgstr ""
 
-#: ../src/extension.js:1245
-msgid "Strong breeze"
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
 msgstr ""
 
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr ""
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+#, fuzzy
+msgid "Clear entry"
+msgstr "Trời trong"
 
-#: ../src/extension.js:1251
-msgid "Fresh gale"
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
 msgstr ""
 
-#: ../src/extension.js:1254
-msgid "Strong gale"
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
 msgstr ""
 
-#: ../src/extension.js:1257
-msgid "Storm"
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
 msgstr ""
 
-#: ../src/extension.js:1260
-msgid "Violent storm"
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
 msgstr ""
 
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "Cuồng phong"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "Chủ Nhật"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "Thứ hai"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "Thứ ba"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "Thứ tư"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "Thứ năm"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "Thứ sáu"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "Thứ bảy"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "B"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "ĐB"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "Đ"
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "ĐN"
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "N"
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "TN"
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "T"
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr ""
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "TB"
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr ""
 
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "Hôm qua"
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s ngày trước"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr ""
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "Hôm nay"
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr ""
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "Ngày mai"
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr ""
 
-#: ../src/extension.js:1682
-#, fuzzy, python-format
-msgid "In %s days"
-msgstr "%s ngày trước"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "Đang tải dữ liệu thời tiết hiện tại..."
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "Đang tải..."
+#: ../data/weather-settings.ui:628
+msgid "Use extensions api-key for openweathermap.org"
+msgstr ""
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "Xin đợi một lát"
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
 msgstr ""
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "Độ ẩm:"
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr ""
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "Áp suất:"
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "Gió:"
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr ""
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "Đơn vị đo nhiệt độ"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "Đơn vị tốc độ gió"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 #, fuzzy
 msgid "Pressure Unit"
 msgstr "Áp suất:"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr ""
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "Vị trí trên thanh pa-nen"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "Ở giữa"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "Bên phải"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "Bên trái"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr ""
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "Dịch tình hình thời tiết"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "Biểu tượng đơn giản"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr ""
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "Hiện nhiệt độ trên pa-nen"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "Hiện thời tiết trên pa-nen"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+#, fuzzy
+msgid "Conditions in Forecast"
+msgstr "Hiện thời tiết trên pa-nen"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr ""
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr ""
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr ""
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "Ở giữa"
+
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "Bên phải"
+
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "Bên trái"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
 msgstr ""
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "Tên thành phố"
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr ""
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "Bạn có muốn xóa %s?"
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr ""
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr ""
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr ""
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr ""
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "Đang tải dữ liệu thời tiết hiện tại..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "%s ngày trước"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s ngày trước"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s ngày trước"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "%s ngày trước"
+
+#~ msgid "Name of the city"
+#~ msgstr "Tên thành phố"
 
 #~ msgid "Loading future weather ..."
 #~ msgstr "Đang tải dữ liệu dự báo thời tiết..."
@@ -583,9 +794,6 @@
 #~ msgid "Partly cloudy"
 #~ msgstr "Ít mây"
 
-#~ msgid "Clear"
-#~ msgstr "Trời trong"
-
 #~ msgid "Sunny"
 #~ msgstr "Nắng"
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/zh_CN.po gnome-shell-extension-weather-0~20151114.git609/po/zh_CN.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/zh_CN.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/zh_CN.po	2015-11-17 15:10:32.000000000 +0000
@@ -2,513 +2,723 @@
 # gnome-shell-extension-openweather 软件包的简体中文翻译.
 # Copyright (C) 2011
 # This file is distributed under the same license as the gnome-shell-extension-openweather package.
+#
 # bill <bill_zt@sina.com>, 2011.
-# 绿色圣光 <lishaohui.qd@163.com>, 2014.
+# 绿色圣光 <lishaohui.qd@163.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extension-openweather\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
-"PO-Revision-Date: 2014-08-17 16:34+0800\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-10-26 00:44+0800\n"
 "Last-Translator: 绿色圣光 <lishaohui.qd@163.com>\n"
-"Language-Team: Chinese (simplified) <>\n"
+"Language-Team: Chinese (Simplified) <>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "未找到 Schema \"%s\"。"
+#: ../src/extension.js:370
+#, fuzzy
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Openweathermap.org 在没有 API 密钥的情况下无法工作。\n"
+"请到 http://openweathermap.org/appid 注册，并将您的个人密钥粘贴到选项对话框"
+"中。"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Forecast.io 在没有 API 密钥的情况下无法工作。\n"
+"请到 https://developer.forecast.io/register 注册，并将您的个人密钥粘贴到选项"
+"对话框中。"
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr "无法连接到 %s"
+
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "地点"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
 msgstr "重载天气信息"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
 msgstr "天气数据源自："
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "无法打开 %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
 msgstr "天气设置"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "无效的城市"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "无效地点！请尝试重建一个。"
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "无风"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "软风"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "轻风"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "微风"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "和风"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "清风"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "强风"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "疾风"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "大风"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "烈风"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "狂风"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "暴风"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "飓风"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "星期日"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "星期一"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "星期二"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "星期三"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "星期四"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "星期五"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "星期六"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "北"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "东北"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "东"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "东南"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "南"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "西南"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "西"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "西北"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "正在加载 ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "请稍候"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "云量："
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "湿度："
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "气压："
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "风："
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天之前"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "今天"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "未来 %d 天"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "小雨伴有雷暴"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "中雨伴有雷暴"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "大雨伴有雷暴"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "小雷暴"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "雷暴"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "强雷暴"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "局部雷暴"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "小毛毛雨伴有雷暴"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "毛毛雨伴有雷暴"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "强毛毛雨伴有雷暴"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "小毛毛雨"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "毛毛雨"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "强毛毛雨"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "小毛毛雨转雨"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "毛毛雨转雨"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "强毛毛雨转雨"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "阵雨及毛毛雨"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "强阵雨及毛毛雨"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "阵毛毛雨"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "小雨"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "中雨"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "大雨"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "暴雨"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "大暴雨"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "冻雨"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "小阵雨"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "阵雨"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "强阵雨"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "局部阵雨"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "小雪"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "雪"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "大雪"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "冰雹"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "阵冰雹"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "小雨夹雪"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "雨夹雪"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "小阵雪"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "阵雪"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "强阵雪"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "薄雾"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "烟"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "霾"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "沙尘暴"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "雾"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "扬沙"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "浮尘"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "火山灰"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "飑"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "龙卷风"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "晴朗"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "少云"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "疏云"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "碎云"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "阴天"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "不可用"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "无风"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "软风"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "轻风"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "微风"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr "搜索“%s”时遇到无效数据"
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "未找到“%s”"
 
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "和风"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "清风"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "强风"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "疾风"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "大风"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "烈风"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "狂风"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "暴风"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "飓风"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "星期日"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "星期一"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "星期二"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "星期三"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "星期四"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "星期五"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "星期六"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "北"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "东北"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "东"
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "东南"
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "南"
-
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "西南"
-
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "西"
-
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "西北"
-
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "昨天"
-
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s 天之前"
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "地点"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "今天"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "提供源"
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "明天"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "移除 %s 吗？"
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "未来 %s 天"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "正在加载当前天气 ..."
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "默认"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "编辑名称"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "清除条目"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "编辑坐标"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "扩展的默认天气提供源"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "取消"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "保存"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "通过地点或坐标搜索"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "例如，“北京”或者“39.9059093,116.3913489”"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "查找"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "选择默认天气提供源"
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "正在加载 ..."
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "openweathermap.org 的个人 API 密钥"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "请稍候"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "forecast.io 的个人 API 密钥"
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr "刷新当前天气的超时时间 [分钟]"
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr "刷新天气预报的超时时间 [分钟]"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "云量："
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+"注意：预报超时不适用于 forecast.io，因为他们不提供当前天气和预报的分别下载。"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "湿度："
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "openweathermap.org 的个人 API 密钥"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "气压："
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "风："
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "天气提供源"
+
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr "选择地理位置提供源"
+
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "developer.mapquest.com 的个人应用密钥"
+
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr "地理位置提供源"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "温度单位"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "风速单位"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "气压单位"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "单位"
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "在面板上的位置"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "中央"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "右侧"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "左侧"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "使用箭头指示风向"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "翻译天气状态"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "显示象征性图标"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr "图标显示文本"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "在面板上显示气温"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "在面板上显示天气状态"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "显示预报天气状态"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
 msgstr "预报信息居中显示"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "预报的天数"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "小数点后最大位数"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "openweathermap.org 的个人 API 密钥"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "中央"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "城市名"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "右侧"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "移除 %s 吗？"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "左侧"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "布局"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "版本："
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "未知（自己构建的？）"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>为全世界几乎所有地点显示来自 <a href=\"https://openweathermap.org/"
+"\">Openweathermap</a> 或 <a href=\"https://forecast.io\">forecast.io</a> 的天"
+"气信息的扩展。</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "维护者："
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "网站主页"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">本程序不提供任何担保。\n"
+"参见 <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\">GNU "
+"通用公共许可证，第二版或更高版本</a>以了解更多细节。</span>"
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "关于"
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "正在加载当前天气 ..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "未来 %s 天"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s 天之前"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s 天之前"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "未来 %s 天"
+
+#~ msgid "Name of the city"
+#~ msgstr "城市名"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/po/zh_TW.po gnome-shell-extension-weather-0~20151114.git609/po/zh_TW.po
--- gnome-shell-extension-weather-0~20140924.git7e28508/po/zh_TW.po	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/po/zh_TW.po	2015-11-17 15:10:32.000000000 +0000
@@ -3,14 +3,14 @@
 # Copyright (C) 2011
 # This file is distributed under the same license as the gnome-shell-extension-openweather package.
 # bill <bill_zt@sina.com>, 2011.
-# shlinux <lishaohui.qd@163.com>, 2014.
+# shlinux <lishaohui.qd@163.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extension-openweather\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 23:12+0200\n"
-"PO-Revision-Date: 2014-08-17 16:40+0800\n"
+"POT-Creation-Date: 2015-11-08 11:59+0100\n"
+"PO-Revision-Date: 2015-10-26 00:44+0800\n"
 "Last-Translator: shlinux <lishaohui.qd@163.com>\n"
 "Language-Team: Chinese (Traditional) <>\n"
 "Language: zh_TW\n"
@@ -18,497 +18,706 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: ../src/extension.js:144
+#: ../src/extension.js:172
 msgid "..."
 msgstr "..."
 
-#: ../src/extension.js:312
-#, python-format
-msgid "Schema \"%s\" not found."
-msgstr "未找到 Schema \"%s\"。"
+#: ../src/extension.js:370
+#, fuzzy
+msgid ""
+"Openweathermap.org does not work without an api-key.\n"
+"Either set the switch to use the extensions default key in the preferences "
+"dialog to on or register at http://openweathermap.org/appid and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Openweathermap.org 在沒有 API 密鑰的情況下無法工作。\n"
+"請到 http://openweathermap.org/appid 註冊，並將您的個人密鑰粘貼到選項對話框"
+"中。"
+
+#: ../src/extension.js:419
+msgid ""
+"Forecast.io does not work without an api-key.\n"
+"Please register at https://developer.forecast.io/register and paste your "
+"personal key into the preferences dialog."
+msgstr ""
+"Forecast.io 在沒有 API 密鑰的情況下無法工作。\n"
+"請到 https://developer.forecast.io/register 註冊，並將您的個人密鑰粘貼到選項"
+"對話框中。"
+
+#: ../src/extension.js:492
+#, javascript-format
+msgid "Can not connect to %s"
+msgstr "無法連接到 %s"
 
-#: ../src/extension.js:714
+#: ../src/extension.js:776 ../data/weather-settings.ui:460
 msgid "Locations"
 msgstr "地點"
 
-#: ../src/extension.js:729
+#: ../src/extension.js:788
 msgid "Reload Weather Information"
-msgstr "重新載入氣象資訊"
+msgstr "重新載入天氣訊息"
 
-#: ../src/extension.js:746
+#: ../src/extension.js:803
 msgid "Weather data provided by:"
-msgstr "氣象數據來源於："
+msgstr "天氣數據來源於："
 
-#: ../src/extension.js:768
-#, python-format
+#: ../src/extension.js:814
+#, javascript-format
 msgid "Can not open %s"
 msgstr "無法打開 %s"
 
-#: ../src/extension.js:776
+#: ../src/extension.js:821
 msgid "Weather Settings"
-msgstr "氣象設定"
+msgstr "天氣設定"
 
-#: ../src/extension.js:839 ../src/extension.js:848 ../src/prefs.js:845
+#: ../src/extension.js:872 ../src/prefs.js:1021
 msgid "Invalid city"
 msgstr "無效的城市代碼"
 
-#: ../src/extension.js:1081
+#: ../src/extension.js:883
+msgid "Invalid location! Please try to recreate it."
+msgstr "無效地點！請嘗試重建一個。"
+
+#: ../src/extension.js:982
+msgid "Calm"
+msgstr "無風"
+
+#: ../src/extension.js:985
+msgid "Light air"
+msgstr "軟風"
+
+#: ../src/extension.js:988
+msgid "Light breeze"
+msgstr "輕風"
+
+#: ../src/extension.js:991
+msgid "Gentle breeze"
+msgstr "微風"
+
+#: ../src/extension.js:994
+msgid "Moderate breeze"
+msgstr "和風"
+
+#: ../src/extension.js:997
+msgid "Fresh breeze"
+msgstr "清風"
+
+#: ../src/extension.js:1000
+msgid "Strong breeze"
+msgstr "強風"
+
+#: ../src/extension.js:1003
+msgid "Moderate gale"
+msgstr "疾風"
+
+#: ../src/extension.js:1006
+msgid "Fresh gale"
+msgstr "大風"
+
+#: ../src/extension.js:1009
+msgid "Strong gale"
+msgstr "烈風"
+
+#: ../src/extension.js:1012
+msgid "Storm"
+msgstr "狂風"
+
+#: ../src/extension.js:1015
+msgid "Violent storm"
+msgstr "暴風"
+
+#: ../src/extension.js:1018
+msgid "Hurricane"
+msgstr "颶風"
+
+#: ../src/extension.js:1022
+msgid "Sunday"
+msgstr "星期日"
+
+#: ../src/extension.js:1022
+msgid "Monday"
+msgstr "星期一"
+
+#: ../src/extension.js:1022
+msgid "Tuesday"
+msgstr "星期二"
+
+#: ../src/extension.js:1022
+msgid "Wednesday"
+msgstr "星期三"
+
+#: ../src/extension.js:1022
+msgid "Thursday"
+msgstr "星期四"
+
+#: ../src/extension.js:1022
+msgid "Friday"
+msgstr "星期五"
+
+#: ../src/extension.js:1022
+msgid "Saturday"
+msgstr "星期六"
+
+#: ../src/extension.js:1028
+msgid "N"
+msgstr "北"
+
+#: ../src/extension.js:1028
+msgid "NE"
+msgstr "東北"
+
+#: ../src/extension.js:1028
+msgid "E"
+msgstr "東"
+
+#: ../src/extension.js:1028
+msgid "SE"
+msgstr "東南"
+
+#: ../src/extension.js:1028
+msgid "S"
+msgstr "南"
+
+#: ../src/extension.js:1028
+msgid "SW"
+msgstr "西南"
+
+#: ../src/extension.js:1028
+msgid "W"
+msgstr "西"
+
+#: ../src/extension.js:1028
+msgid "NW"
+msgstr "西北"
+
+#: ../src/extension.js:1321
+msgid "Loading ..."
+msgstr "載入中 ..."
+
+#: ../src/extension.js:1325
+msgid "Please wait"
+msgstr "請稍候"
+
+#: ../src/extension.js:1386
+msgid "Cloudiness:"
+msgstr "雲量："
+
+#: ../src/extension.js:1390
+msgid "Humidity:"
+msgstr "濕度："
+
+#: ../src/extension.js:1394
+msgid "Pressure:"
+msgstr "氣壓："
+
+#: ../src/extension.js:1398
+msgid "Wind:"
+msgstr "風："
+
+#: ../src/forecast_io.js:151 ../src/forecast_io.js:273
+#: ../src/openweathermap_org.js:349 ../src/openweathermap_org.js:451
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../src/forecast_io.js:154 ../src/forecast_io.js:276
+#: ../src/openweathermap_org.js:351 ../src/openweathermap_org.js:453
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天以前"
+
+#: ../src/forecast_io.js:253 ../src/openweathermap_org.js:445
+msgid "Today"
+msgstr "今天"
+
+#: ../src/forecast_io.js:269 ../src/openweathermap_org.js:447
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../src/forecast_io.js:271 ../src/openweathermap_org.js:449
+#, javascript-format
+msgid "In %d day"
+msgid_plural "In %d days"
+msgstr[0] "未來 %d 天"
+
+#: ../src/openweathermap_org.js:181
 msgid "thunderstorm with light rain"
 msgstr "雷暴伴有小雨"
 
-#: ../src/extension.js:1083
+#: ../src/openweathermap_org.js:183
 msgid "thunderstorm with rain"
 msgstr "雷暴伴有雨"
 
-#: ../src/extension.js:1085
+#: ../src/openweathermap_org.js:185
 msgid "thunderstorm with heavy rain"
 msgstr "雷暴伴有大雨"
 
-#: ../src/extension.js:1087
+#: ../src/openweathermap_org.js:187
 msgid "light thunderstorm"
 msgstr "小雷暴"
 
-#: ../src/extension.js:1089
+#: ../src/openweathermap_org.js:189
 msgid "thunderstorm"
 msgstr "雷暴"
 
-#: ../src/extension.js:1091
+#: ../src/openweathermap_org.js:191
 msgid "heavy thunderstorm"
 msgstr "強雷暴"
 
-#: ../src/extension.js:1093
+#: ../src/openweathermap_org.js:193
 msgid "ragged thunderstorm"
 msgstr "局部性雷暴"
 
-#: ../src/extension.js:1095
+#: ../src/openweathermap_org.js:195
 msgid "thunderstorm with light drizzle"
 msgstr "雷暴伴有小毛雨"
 
-#: ../src/extension.js:1097
+#: ../src/openweathermap_org.js:197
 msgid "thunderstorm with drizzle"
 msgstr "雷暴伴有毛雨"
 
-#: ../src/extension.js:1099
+#: ../src/openweathermap_org.js:199
 msgid "thunderstorm with heavy drizzle"
 msgstr "雷暴伴有強毛雨"
 
-#: ../src/extension.js:1101
+#: ../src/openweathermap_org.js:201
 msgid "light intensity drizzle"
 msgstr "小毛雨"
 
-#: ../src/extension.js:1103
+#: ../src/openweathermap_org.js:203
 msgid "drizzle"
 msgstr "毛雨"
 
-#: ../src/extension.js:1105
+#: ../src/openweathermap_org.js:205
 msgid "heavy intensity drizzle"
 msgstr "強毛雨"
 
-#: ../src/extension.js:1107
+#: ../src/openweathermap_org.js:207
 msgid "light intensity drizzle rain"
 msgstr "小毛雨至雨"
 
-#: ../src/extension.js:1109
+#: ../src/openweathermap_org.js:209
 msgid "drizzle rain"
 msgstr "毛雨至雨"
 
-#: ../src/extension.js:1111
+#: ../src/openweathermap_org.js:211
 msgid "heavy intensity drizzle rain"
 msgstr "强毛雨至雨"
 
-#: ../src/extension.js:1113
+#: ../src/openweathermap_org.js:213
 msgid "shower rain and drizzle"
 msgstr "阵雨及毛雨"
 
-#: ../src/extension.js:1115
+#: ../src/openweathermap_org.js:215
 msgid "heavy shower rain and drizzle"
 msgstr "強陣雨及毛雨"
 
-#: ../src/extension.js:1117
+#: ../src/openweathermap_org.js:217
 msgid "shower drizzle"
 msgstr "陣毛雨"
 
-#: ../src/extension.js:1119
+#: ../src/openweathermap_org.js:219
 msgid "light rain"
 msgstr "小雨"
 
-#: ../src/extension.js:1121
+#: ../src/openweathermap_org.js:221
 msgid "moderate rain"
 msgstr "中雨"
 
-#: ../src/extension.js:1123
+#: ../src/openweathermap_org.js:223
 msgid "heavy intensity rain"
 msgstr "大雨"
 
-#: ../src/extension.js:1125
+#: ../src/openweathermap_org.js:225
 msgid "very heavy rain"
 msgstr "豪雨"
 
-#: ../src/extension.js:1127
+#: ../src/openweathermap_org.js:227
 msgid "extreme rain"
 msgstr "大豪雨"
 
-#: ../src/extension.js:1129
+#: ../src/openweathermap_org.js:229
 msgid "freezing rain"
 msgstr "凍雨"
 
-#: ../src/extension.js:1131
+#: ../src/openweathermap_org.js:231
 msgid "light intensity shower rain"
 msgstr "小陣雨"
 
-#: ../src/extension.js:1133
+#: ../src/openweathermap_org.js:233
 msgid "shower rain"
 msgstr "陣雨"
 
-#: ../src/extension.js:1135
+#: ../src/openweathermap_org.js:235
 msgid "heavy intensity shower rain"
 msgstr "強陣雨"
 
-#: ../src/extension.js:1137
+#: ../src/openweathermap_org.js:237
 msgid "ragged shower rain"
 msgstr "局部性陣雨"
 
-#: ../src/extension.js:1139
+#: ../src/openweathermap_org.js:239
 msgid "light snow"
 msgstr "小雪"
 
-#: ../src/extension.js:1141
+#: ../src/openweathermap_org.js:241
 msgid "snow"
 msgstr "雪"
 
-#: ../src/extension.js:1143
+#: ../src/openweathermap_org.js:243
 msgid "heavy snow"
 msgstr "大雪"
 
-#: ../src/extension.js:1145
+#: ../src/openweathermap_org.js:245
 msgid "sleet"
 msgstr "冰雹"
 
-#: ../src/extension.js:1147
+#: ../src/openweathermap_org.js:247
 msgid "shower sleet"
 msgstr "陣雹"
 
-#: ../src/extension.js:1149
+#: ../src/openweathermap_org.js:249
 msgid "light rain and snow"
 msgstr "小雨夾雪"
 
-#: ../src/extension.js:1151
+#: ../src/openweathermap_org.js:251
 msgid "rain and snow"
 msgstr "雨夾雪"
 
-#: ../src/extension.js:1153
+#: ../src/openweathermap_org.js:253
 msgid "light shower snow"
 msgstr "小陣雪"
 
-#: ../src/extension.js:1155
+#: ../src/openweathermap_org.js:255
 msgid "shower snow"
 msgstr "陣雪"
 
-#: ../src/extension.js:1157
+#: ../src/openweathermap_org.js:257
 msgid "heavy shower snow"
 msgstr "強陣雪"
 
-#: ../src/extension.js:1159
+#: ../src/openweathermap_org.js:259
 msgid "mist"
 msgstr "薄霧"
 
-#: ../src/extension.js:1161
+#: ../src/openweathermap_org.js:261
 msgid "smoke"
 msgstr "煙"
 
-#: ../src/extension.js:1163
+#: ../src/openweathermap_org.js:263
 msgid "haze"
 msgstr "霾"
 
-#: ../src/extension.js:1165
+#: ../src/openweathermap_org.js:265
 msgid "Sand/Dust Whirls"
 msgstr "沙塵暴"
 
-#: ../src/extension.js:1167
+#: ../src/openweathermap_org.js:267
 msgid "Fog"
 msgstr "霧"
 
-#: ../src/extension.js:1169
+#: ../src/openweathermap_org.js:269
 msgid "sand"
 msgstr "沙"
 
-#: ../src/extension.js:1171
+#: ../src/openweathermap_org.js:271
 msgid "dust"
 msgstr "塵"
 
-#: ../src/extension.js:1173
+#: ../src/openweathermap_org.js:273
 msgid "VOLCANIC ASH"
 msgstr "火山灰"
 
-#: ../src/extension.js:1175
+#: ../src/openweathermap_org.js:275
 msgid "SQUALLS"
 msgstr "颮"
 
-#: ../src/extension.js:1177
+#: ../src/openweathermap_org.js:277
 msgid "TORNADO"
 msgstr "龍卷風"
 
-#: ../src/extension.js:1179
+#: ../src/openweathermap_org.js:279
 msgid "sky is clear"
 msgstr "晴朗"
 
-#: ../src/extension.js:1181
+#: ../src/openweathermap_org.js:281
 msgid "few clouds"
 msgstr "少雲"
 
-#: ../src/extension.js:1183
+#: ../src/openweathermap_org.js:283
 msgid "scattered clouds"
 msgstr "疏雲"
 
-#: ../src/extension.js:1185
+#: ../src/openweathermap_org.js:285
 msgid "broken clouds"
 msgstr "碎雲"
 
-#: ../src/extension.js:1187
+#: ../src/openweathermap_org.js:287
 msgid "overcast clouds"
 msgstr "陰天"
 
-#: ../src/extension.js:1189
+#: ../src/openweathermap_org.js:289
 msgid "Not available"
 msgstr "無法使用"
 
-#: ../src/extension.js:1227
-msgid "Calm"
-msgstr "無風"
-
-#: ../src/extension.js:1230
-msgid "Light air"
-msgstr "軟風"
-
-#: ../src/extension.js:1233
-msgid "Light breeze"
-msgstr "輕風"
-
-#: ../src/extension.js:1236
-msgid "Gentle breeze"
-msgstr "微風"
-
-#: ../src/extension.js:1239
-msgid "Moderate breeze"
-msgstr "和風"
-
-#: ../src/extension.js:1242
-msgid "Fresh breeze"
-msgstr "清風"
-
-#: ../src/extension.js:1245
-msgid "Strong breeze"
-msgstr "強風"
-
-#: ../src/extension.js:1248
-msgid "Moderate gale"
-msgstr "疾風"
-
-#: ../src/extension.js:1251
-msgid "Fresh gale"
-msgstr "大風"
-
-#: ../src/extension.js:1254
-msgid "Strong gale"
-msgstr "烈風"
-
-#: ../src/extension.js:1257
-msgid "Storm"
-msgstr "狂風"
-
-#: ../src/extension.js:1260
-msgid "Violent storm"
-msgstr "暴風"
-
-#: ../src/extension.js:1263
-msgid "Hurricane"
-msgstr "颶風"
-
-#: ../src/extension.js:1267
-msgid "Sunday"
-msgstr "星期日"
-
-#: ../src/extension.js:1267
-msgid "Monday"
-msgstr "星期一"
-
-#: ../src/extension.js:1267
-msgid "Tuesday"
-msgstr "星期二"
-
-#: ../src/extension.js:1267
-msgid "Wednesday"
-msgstr "星期三"
-
-#: ../src/extension.js:1267
-msgid "Thursday"
-msgstr "星期四"
-
-#: ../src/extension.js:1267
-msgid "Friday"
-msgstr "星期五"
-
-#: ../src/extension.js:1267
-msgid "Saturday"
-msgstr "星期六"
-
-#: ../src/extension.js:1273
-msgid "N"
-msgstr "北"
-
-#: ../src/extension.js:1273
-msgid "NE"
-msgstr "東北"
-
-#: ../src/extension.js:1273
-msgid "E"
-msgstr "東"
-
-#: ../src/extension.js:1273
-msgid "SE"
-msgstr "東南"
-
-#: ../src/extension.js:1273
-msgid "S"
-msgstr "南"
-
-#: ../src/extension.js:1273
-msgid "SW"
-msgstr "西南"
-
-#: ../src/extension.js:1273
-msgid "W"
-msgstr "西"
+#: ../src/prefs.js:215 ../src/prefs.js:271 ../src/prefs.js:319
+#: ../src/prefs.js:326
+#, javascript-format
+msgid "Invalid data when searching for \"%s\""
+msgstr "搜索「%s」時遇到無效數據"
+
+#: ../src/prefs.js:223 ../src/prefs.js:287 ../src/prefs.js:332
+#, javascript-format
+msgid "\"%s\" not found"
+msgstr "未找到「%s」"
 
-#: ../src/extension.js:1273
-msgid "NW"
-msgstr "西北"
-
-#: ../src/extension.js:1494 ../src/extension.js:1684
-msgid "Yesterday"
-msgstr "昨天"
-
-#: ../src/extension.js:1496 ../src/extension.js:1686
-#, python-format
-msgid "%s days ago"
-msgstr "%s 天以前"
+#: ../src/prefs.js:393
+msgid "Location"
+msgstr "地點"
 
-#: ../src/extension.js:1678
-msgid "Today"
-msgstr "今天"
+#: ../src/prefs.js:403
+msgid "Provider"
+msgstr "提供源"
 
-#: ../src/extension.js:1680
-msgid "Tomorrow"
-msgstr "明天"
+#: ../src/prefs.js:535
+#, javascript-format
+msgid "Remove %s ?"
+msgstr "移除 %s ？"
 
-#: ../src/extension.js:1682
-#, python-format
-msgid "In %s days"
-msgstr "未來 %s 天"
-
-#: ../src/extension.js:1753
-msgid "Loading current weather ..."
-msgstr "正在載入即時天氣 ..."
+#: ../src/prefs.js:1056
+msgid "default"
+msgstr "默認"
+
+#: ../data/weather-settings.ui:31
+msgid "Edit name"
+msgstr "編輯名稱"
+
+#: ../data/weather-settings.ui:49 ../data/weather-settings.ui:79
+#: ../data/weather-settings.ui:219
+msgid "Clear entry"
+msgstr "清除條目"
+
+#: ../data/weather-settings.ui:63
+msgid "Edit coordinates"
+msgstr "編輯座標"
+
+#: ../data/weather-settings.ui:93 ../data/weather-settings.ui:256
+msgid "Extensions default weather provider"
+msgstr "擴展的默認天氣提供源"
+
+#: ../data/weather-settings.ui:125 ../data/weather-settings.ui:288
+msgid "Cancel"
+msgstr "取消"
+
+#: ../data/weather-settings.ui:143 ../data/weather-settings.ui:306
+msgid "Save"
+msgstr "儲存"
+
+#: ../data/weather-settings.ui:196
+msgid "Search by location or coordinates"
+msgstr "通過地點或座標搜索"
+
+#: ../data/weather-settings.ui:220
+msgid "e.g. Vaiaku, Tuvalu or -8.5211767,179.1976747"
+msgstr "例如，「臺北」或者「25.08571815,121.5643773」"
+
+#: ../data/weather-settings.ui:230
+msgid "Find"
+msgstr "尋找"
+
+#: ../data/weather-settings.ui:481
+msgid "Chose default weather provider"
+msgstr "選擇默認天氣提供源"
 
-#: ../src/extension.js:1785
-msgid "Loading ..."
-msgstr "載入中 ..."
+#: ../data/weather-settings.ui:494
+msgid "Personal Api key from openweathermap.org"
+msgstr "openweathermap.org 的個人 API 密鑰"
 
-#: ../src/extension.js:1789
-msgid "Please wait"
-msgstr "請稍候"
+#: ../data/weather-settings.ui:545
+msgid "Personal Api key from forecast.io"
+msgstr "forecast.io 的個人 API 密鑰"
+
+#: ../data/weather-settings.ui:558
+msgid "Refresh timeout for current weather [min]"
+msgstr "刷新當前天氣的超時時間 [分鐘]"
+
+#: ../data/weather-settings.ui:572
+msgid "Refresh timeout for weather forecast [min]"
+msgstr "刷新天氣預報的超時時間 [分鐘]"
 
-#: ../src/extension.js:1850
-msgid "Cloudiness:"
-msgstr "雲量："
+#: ../data/weather-settings.ui:600
+msgid ""
+"Note: the forecast-timout is not used for forecast.io, because they do not "
+"provide seperate downloads for current weather and forecasts."
+msgstr ""
+"注意：預報超時不適用於 forecast.io，因爲他們不提供當前天氣和預報的分別下載。"
 
-#: ../src/extension.js:1854
-msgid "Humidity:"
-msgstr "濕度："
+#: ../data/weather-settings.ui:628
+#, fuzzy
+msgid "Use extensions api-key for openweathermap.org"
+msgstr "openweathermap.org 的個人 API 密鑰"
 
-#: ../src/extension.js:1858
-msgid "Pressure:"
-msgstr "氣壓："
+#: ../data/weather-settings.ui:639
+msgid ""
+"Switch off, if you have your own api-key for openweathermap.org and put it "
+"into the text-box below."
+msgstr ""
 
-#: ../src/extension.js:1862
-msgid "Wind:"
-msgstr "風："
+#: ../data/weather-settings.ui:656
+msgid "Weather provider"
+msgstr "天氣提供源"
+
+#: ../data/weather-settings.ui:676
+msgid "Chose geolocation provider"
+msgstr "選擇地理位置提供源"
+
+#: ../data/weather-settings.ui:702
+msgid "Personal AppKey from developer.mapquest.com"
+msgstr "developer.mapquest.com 的個人應用密鑰"
+
+#: ../data/weather-settings.ui:731
+msgid "Geolocation provider"
+msgstr "地理位置提供源"
 
-#: ../src/prefs.js:128
+#: ../data/weather-settings.ui:751
 msgid "Temperature Unit"
 msgstr "溫度單位"
 
-#: ../src/prefs.js:130
+#: ../data/weather-settings.ui:762
 msgid "Wind Speed Unit"
 msgstr "風速單位"
 
-#: ../src/prefs.js:132
+#: ../data/weather-settings.ui:773
 msgid "Pressure Unit"
 msgstr "氣壓單位"
 
-#: ../src/prefs.js:134
+#: ../data/weather-settings.ui:849
+msgid "Units"
+msgstr "單位"
+
+#: ../data/weather-settings.ui:869
 msgid "Position in Panel"
 msgstr "面板上的位置"
 
-#: ../src/prefs.js:135
-msgid "Center"
-msgstr "中央"
-
-#: ../src/prefs.js:135
-msgid "Right"
-msgstr "右邊"
-
-#: ../src/prefs.js:135
-msgid "Left"
-msgstr "左邊"
-
-#: ../src/prefs.js:136
+#: ../data/weather-settings.ui:880
 msgid "Wind Direction by Arrows"
 msgstr "使用箭頭指示風向"
 
-#: ../src/prefs.js:138
+#: ../data/weather-settings.ui:891
 msgid "Translate Conditions"
 msgstr "翻譯天氣狀態"
 
-#: ../src/prefs.js:140
+#: ../data/weather-settings.ui:902
 msgid "Symbolic Icons"
 msgstr "顯示象徵性符號"
 
-#: ../src/prefs.js:142
+#: ../data/weather-settings.ui:913
 msgid "Text on buttons"
 msgstr "圖示顯示文本"
 
-#: ../src/prefs.js:144
+#: ../data/weather-settings.ui:924
 msgid "Temperature in Panel"
 msgstr "面板上顯示溫度"
 
-#: ../src/prefs.js:146
+#: ../data/weather-settings.ui:935
 msgid "Conditions in Panel"
 msgstr "面板上顯示天氣狀態"
 
-#: ../src/prefs.js:148
+#: ../data/weather-settings.ui:946
+msgid "Conditions in Forecast"
+msgstr "顯示預報天氣狀態"
+
+#: ../data/weather-settings.ui:957
 msgid "Center forecast"
-msgstr "預報資訊居中顯示"
+msgstr "預報訊息居中顯示"
 
-#: ../src/prefs.js:150
+#: ../data/weather-settings.ui:968
 msgid "Number of days in forecast"
 msgstr "預報的天數"
 
-#: ../src/prefs.js:152
+#: ../data/weather-settings.ui:979
 msgid "Maximal number of digits after the decimal point"
 msgstr "小數點後的最大位數"
 
-#: ../src/prefs.js:154
-msgid "Personal Api key from openweathermap.org"
-msgstr "openweathermap.org 的個人 API 密鑰"
+#: ../data/weather-settings.ui:991
+msgid "Center"
+msgstr "中央"
 
-#: ../src/prefs.js:303
-msgid "Name of the city"
-msgstr "城市名"
+#: ../data/weather-settings.ui:992
+msgid "Right"
+msgstr "右邊"
 
-#: ../src/prefs.js:488
-#, python-format
-msgid "Remove %s ?"
-msgstr "移除 %s ？"
+#: ../data/weather-settings.ui:993
+msgid "Left"
+msgstr "左邊"
+
+#: ../data/weather-settings.ui:1135
+msgid "Layout"
+msgstr "佈局"
+
+#: ../data/weather-settings.ui:1187
+msgid "Version: "
+msgstr "版本："
+
+#: ../data/weather-settings.ui:1201
+msgid "unknown (self-build ?)"
+msgstr "未知（自建？）"
+
+#: ../data/weather-settings.ui:1221
+msgid ""
+"<span>Weather extension to display weather information from <a href="
+"\"https://openweathermap.org/\">Openweathermap</a> or <a href=\"https://"
+"forecast.io\">forecast.io</a> for almost all locations in the world.</span>"
+msgstr ""
+"<span>爲全世界幾乎所有地點顯示來自 <a href=\"https://openweathermap.org/"
+"\">Openweathermap</a> 或 <a href=\"https://forecast.io\">forecast.io</a> 的天"
+"氣信息的擴展。</span>"
+
+#: ../data/weather-settings.ui:1244
+msgid "Maintained by"
+msgstr "維護者："
+
+#: ../data/weather-settings.ui:1274
+msgid "Webpage"
+msgstr "網站主頁"
+
+#: ../data/weather-settings.ui:1295
+msgid ""
+"<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+"See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+"\">GNU General Public License, version 2 or later</a> for details.</span>"
+msgstr ""
+"<span size=\"small\">本程式不提供任何擔保。\n"
+"參閱 <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\">GNU "
+"通用公共授權條款，第二版或更高版本</a>以了解詳細信息。</span>"
+
+#: ../data/weather-settings.ui:1316
+msgid "About"
+msgstr "關於"
+
+#~ msgid "Loading current weather ..."
+#~ msgstr "正在載入即時天氣 ..."
+
+#, fuzzy
+#~ msgid "In %d days"
+#~ msgstr "未來 %s 天"
+
+#, fuzzy
+#~ msgid "One %ds ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s 天以前"
+
+#, fuzzy
+#~ msgid "One %d ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%s 天以前"
+
+#, fuzzy
+#~ msgid "In one day"
+#~ msgid_plural "In %d days"
+#~ msgstr[0] "未來 %s 天"
+
+#~ msgid "Name of the city"
+#~ msgstr "城市名"
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/README.md gnome-shell-extension-weather-0~20151114.git609/README.md
--- gnome-shell-extension-weather-0~20140924.git7e28508/README.md	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/README.md	2015-11-17 15:10:32.000000000 +0000
@@ -2,7 +2,10 @@
 
 *gnome-shell-extension-openweather* is a simple extension for displaying weather conditions and forecasts in GNOME Shell, featuring support for multiple locations, no need for WOEID, a symmetrical layout and a settings panel through *gnome-shell-extension-prefs*.
 
-Currently, the weather data, including forecasts for up to ten days, is fetched from [OpenWeatherMap](http://openweathermap.org/).
+The weather data is fetched from [OpenWeatherMap](https://openweathermap.org/) (including forecasts for up to ten days) or [forecast.io](https://forecast.io) (including forecasts for up to eight days).
+
+#### Note: since version 29 this extensions uses coordinates to store the locations and makes the names editable to support multiple weather-providers!
+#### If you update from versions prior to 29 to 29 or greater (with forecast.io - support) you have to recreate your locations.
 
 ----
 
@@ -31,19 +34,7 @@
 
 ### [Fedora](https://fedoraproject.org/)
 
-You can install the extension from [my repo](http://rpm.jenslody.de/).
-I have packages for Fedora 18, 19 and 20.
-
-To install my repo download and install [this rpm](http://rpm.jenslody.de/fedora-jenslody.de-0.1-2.fc17.noarch.rpm).
-
-If it is not installed automatically, just run:
-
-    sudo yum localinstall --nogpgcheck http://rpm.jenslody.de/fedora-jenslody.de-0.1-2.fc17.noarch.rpm
-
-Now you can install the extension, either via your favourite package-manager or on a console:
-
-    sudo yum install gnome-shell-extension-openweather
-
+You can install the extension from the official Fedora repos.
 
 ## Generic (Local installation)
 
@@ -63,7 +54,7 @@
 Run the following commands:
 
 	cd ~ && git clone git://github.com/jenslody/gnome-shell-extension-openweather.git
-	cd ~/gnome-shell-extension-weather
+	cd ~/gnome-shell-extension-openweather
 	./autogen.sh && make local-install
 
 ----
@@ -76,19 +67,15 @@
 
 You can also use *dconf-editor* or *gsettings* to configure the extension through the command line.
 
-If you switch from old openweathermap to the new master ( or openweathermap), you can load the settings with
-
-    dconf dump /org/gnome/shell/extensions/weather/ | dconf load /org/gnome/shell/extensions/openweather/
-
-This can also work for most locations, if you switch from old yahoo-based master-branch (now yahoo) to the new master-branch (openweathermap-based).
+On [OpenWeatherMap](https://openweathermap.org/) you can either use the extensions default-key or register to get a [personal API key](http://openweathermap.org/appid). This key has to be added in the preferences dialog. Don't forget to switch the a appropriate switch in the dialog to "off" in this case.
 
-The [OpenWeatherMap](http://openweathermap.org/) maintainers recommend to use an [API key](http://openweathermap.org/appid). This key can be added in the preferences dialog.
+To use [Forecast.io](https://forecast.io) you also need to [register](https://developer.forecast.io/register) and get an API key. With this key you can make 1000 requests per day for free. This should be enough for this extension in any normal use case. Do not add billing information, otherwise you might have to pay for the weather-data if something went wrong !
 
 ----
 
 # Licence
 
-Copyright (C) 2011 - 2014
+Copyright (C) 2011 - 2015
 
 * Elad Alfassa <elad@fedoraproject.org>,
 * Mark Benjamin <weather.gnome.Markie1@dfgh.net>,
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/src/extension.js gnome-shell-extension-weather-0~20151114.git609/src/extension.js
--- gnome-shell-extension-weather-0~20140924.git7e28508/src/extension.js	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/src/extension.js	2015-11-17 15:10:32.000000000 +0000
@@ -5,7 +5,7 @@
  *  - Displays a small weather information on the top panel.
  *  - On click, gives a popup with details about the weather.
  *
- * Copyright (C) 2011 - 2014
+ * Copyright (C) 2011 - 2013
  *     ecyrbe <ecyrbe+spam@gmail.com>,
  *     Timur Kristof <venemo@msn.com>,
  *     Elad Alfassa <elad@fedoraproject.org>,
@@ -15,6 +15,8 @@
  *     Mattia Meneguzzo odysseus@fedoraproject.org,
  *     Meng Zhuo <mengzhuo1203+spam@gmail.com>,
  *     Jens Lody <jens@jenslody.de>
+ * Copyright (C) 2014 -2015
+ *     Jens Lody <jens@jenslody.de>,
  *
  *
  * This file is part of gnome-shell-extension-openweather.
@@ -38,14 +40,18 @@
 const Me = ExtensionUtils.getCurrentExtension();
 const Config = imports.misc.config;
 const Convenience = Me.imports.convenience;
+const ForecastIo = Me.imports.forecast_io;
+const OpenweathermapOrg = Me.imports.openweathermap_org;
 const Clutter = imports.gi.Clutter;
 const Gettext = imports.gettext.domain('gnome-shell-extension-openweather');
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Soup = imports.gi.Soup;
 const St = imports.gi.St;
+const GnomeSession = imports.misc.gnomeSession;
 const Util = imports.misc.util;
 const _ = Gettext.gettext;
 
@@ -54,34 +60,39 @@
 const PopupMenu = imports.ui.popupMenu;
 
 // Settings
-const WEATHER_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.openweather';
-const WEATHER_UNIT_KEY = 'unit';
-const WEATHER_WIND_SPEED_UNIT_KEY = 'wind-speed-unit';
-const WEATHER_WIND_DIRECTION_KEY = 'wind-direction';
-const WEATHER_PRESSURE_UNIT_KEY = 'pressure-unit';
-const WEATHER_CITY_KEY = 'city';
-const WEATHER_ACTUAL_CITY_KEY = 'actual-city';
-const WEATHER_TRANSLATE_CONDITION_KEY = 'translate-condition';
-const WEATHER_USE_SYMBOLIC_ICONS_KEY = 'use-symbolic-icons';
-const WEATHER_USE_TEXT_ON_BUTTONS_KEY = 'use-text-on-buttons';
-const WEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel';
-const WEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel';
-const WEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel';
-const WEATHER_REFRESH_INTERVAL_CURRENT = 'refresh-interval-current';
-const WEATHER_REFRESH_INTERVAL_FORECAST = 'refresh-interval-forecast';
-const WEATHER_CENTER_FORECAST_KEY = 'center-forecast';
-const WEATHER_DAYS_FORECAST = 'days-forecast';
-const WEATHER_DECIMAL_PLACES = 'decimal-places';
-const WEATHER_OWM_API_KEY = 'appid';
-
-//URL
-const WEATHER_URL_HOST = 'api.openweathermap.org';
-const WEATHER_URL_PORT = 80;
-const WEATHER_URL_BASE = 'http://' + WEATHER_URL_HOST + '/data/2.5/';
-const WEATHER_URL_CURRENT = WEATHER_URL_BASE + 'weather';
-const WEATHER_URL_FORECAST = WEATHER_URL_BASE + 'forecast/daily';
+const OPENWEATHER_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.openweather';
+const OPENWEATHER_DESKTOP_INTERFACE = 'org.gnome.desktop.interface';
+const OPENWEATHER_PROVIDER_KEY = 'weather-provider';
+const OPENWEATHER_UNIT_KEY = 'unit';
+const OPENWEATHER_WIND_SPEED_UNIT_KEY = 'wind-speed-unit';
+const OPENWEATHER_WIND_DIRECTION_KEY = 'wind-direction';
+const OPENWEATHER_PRESSURE_UNIT_KEY = 'pressure-unit';
+const OPENWEATHER_CITY_KEY = 'city';
+const OPENWEATHER_ACTUAL_CITY_KEY = 'actual-city';
+const OPENWEATHER_TRANSLATE_CONDITION_KEY = 'translate-condition';
+const OPENWEATHER_USE_SYMBOLIC_ICONS_KEY = 'use-symbolic-icons';
+const OPENWEATHER_USE_TEXT_ON_BUTTONS_KEY = 'use-text-on-buttons';
+const OPENWEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel';
+const OPENWEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel';
+const OPENWEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel';
+const OPENWEATHER_SHOW_COMMENT_IN_FORECAST_KEY = 'show-comment-in-forecast';
+const OPENWEATHER_REFRESH_INTERVAL_CURRENT = 'refresh-interval-current';
+const OPENWEATHER_REFRESH_INTERVAL_FORECAST = 'refresh-interval-forecast';
+const OPENWEATHER_CENTER_FORECAST_KEY = 'center-forecast';
+const OPENWEATHER_DAYS_FORECAST = 'days-forecast';
+const OPENWEATHER_DECIMAL_PLACES = 'decimal-places';
+const OPENWEATHER_USE_DEFAULT_OWM_API_KEY = 'use-default-owm-key';
+const OPENWEATHER_OWM_API_KEY = 'appid';
+const OPENWEATHER_OWM_DEFAULT_API_KEY = 'c93b4a667c8c9d1d1eb941621f899bb8';
+const OPENWEATHER_FC_API_KEY = 'appid-fc';
 
 // Keep enums in sync with GSettings schemas
+const WeatherProvider = {
+    DEFAULT: -1,
+    OPENWEATHERMAP: 0,
+    FORECAST_IO: 1
+};
+
 const WeatherUnits = {
     CELSIUS: 0,
     FAHRENHEIT: 1,
@@ -103,15 +114,16 @@
 };
 
 const WeatherPressureUnits = {
-    hPa: 0,
-    inHg: 1,
-    bar: 2,
-    Pa: 3,
-    kPa: 4,
-    atm: 5,
-    at: 6,
-    Torr: 7,
-    psi: 8
+    HPA: 0,
+    INHG: 1,
+    BAR: 2,
+    PA: 3,
+    KPA: 4,
+    ATM: 5,
+    AT: 6,
+    TORR: 7,
+    PSI: 8,
+    MMHG: 9
 };
 
 const WeatherPosition = {
@@ -120,12 +132,14 @@
     LEFT: 2
 };
 
-const WEATHER_CONV_MPS_IN_MPH = 2.23693629;
-const WEATHER_CONV_MPS_IN_KPH = 3.6;
-const WEATHER_CONV_MPS_IN_KNOTS = 1.94384449;
-const WEATHER_CONV_MPS_IN_FPS = 3.2808399;
+const OPENWEATHER_CONV_MPS_IN_MPH = 2.23693629;
+const OPENWEATHER_CONV_MPS_IN_KPH = 3.6;
+const OPENWEATHER_CONV_MPS_IN_KNOTS = 1.94384449;
+const OPENWEATHER_CONV_MPS_IN_FPS = 3.2808399;
 
 let _httpSession;
+let _currentWeatherCache, _forecastWeatherCache;
+let _timeCacheCurrentWeather, _timeCacheForecastWeather;
 
 const OpenweatherMenuButton = new Lang.Class({
     Name: 'OpenweatherMenuButton',
@@ -133,8 +147,22 @@
     Extends: PanelMenu.Button,
 
     _init: function() {
-        this.currentWeatherCache = undefined;
-        this.forecastWeatherCache = undefined;
+        this.owmCityId = 0;
+
+        // Create user-agent string from uuid and (if present) the version
+        this.user_agent = Me.metadata.uuid;
+        if (Me.metadata.version !== undefined && Me.metadata.version.toString().trim() !== '') {
+            this.user_agent += '/';
+            this.user_agent += Me.metadata.version.toString();
+        }
+        // add trailing space, so libsoup adds its own user-agent
+        this.user_agent += ' ';
+
+        this.oldProvider = this._weather_provider;
+        this.oldUseDefaultOwmKey = this._use_default_owm_key;
+        this.oldTranslateCondition = this._translate_condition;
+        this.switchProvider();
+
         // Load settings
         this.loadConfig();
 
@@ -145,7 +173,7 @@
         });
 
         this._weatherIcon = new St.Icon({
-            icon_name: 'view-refresh' + this.icon_type(),
+            icon_name: 'view-refresh' + this.getIconType(),
             style_class: 'system-status-icon openweather-icon'
         });
 
@@ -186,6 +214,8 @@
         else
             Main.panel._menus.addMenu(this.menu);
 
+        this._session = new GnomeSession.SessionManager();
+
         this._old_position_in_panel = this._position_in_panel;
 
         // Current weather
@@ -201,13 +231,8 @@
             reactive: false
         });
 
-        if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION)) {
-            _itemCurrent.addActor(this._currentWeather);
-            _itemFuture.addActor(this._futureWeather);
-        } else {
-            _itemCurrent.actor.add_actor(this._currentWeather);
-            _itemFuture.actor.add_actor(this._futureWeather);
-        }
+        _itemCurrent.actor.add_actor(this._currentWeather);
+        _itemFuture.actor.add_actor(this._futureWeather);
 
         this.menu.addMenuItem(_itemCurrent);
 
@@ -240,21 +265,49 @@
         this.rebuildCurrentWeatherUi();
         this.rebuildFutureWeatherUi();
 
+        this._idle = false;
+        this._connected = false;
+
         this._network_monitor = Gio.network_monitor_get_default();
 
-        this._connected = false;
+        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
+            this._onStatusChanged(proxy.status);
+        }));
+        this._presence_connection = this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
+            this._onStatusChanged(status);
+        }));
+
+        this.currentWeatherCache = _currentWeatherCache;
+        this.forecastWeatherCache = _forecastWeatherCache;
+        if (_timeCacheForecastWeather !== undefined) {
+            let diff = Math.floor(new Date(new Date() - _timeCacheForecastWeather).getTime() / 1000);
+            if (diff < this._refresh_interval_forecast)
+                this.reloadWeatherForecast(this._refresh_interval_forecast - diff);
+        }
+        if (_timeCacheCurrentWeather !== undefined) {
+            let diff = Math.floor(new Date(new Date() - _timeCacheCurrentWeather).getTime() / 1000);
+            if (diff < this._refresh_interval_current)
+                this.reloadWeatherCurrent(this._refresh_interval_current - diff);
+        }
         this._network_monitor_connection = this._network_monitor.connect('network-changed', Lang.bind(this, this._onNetworkStateChanged));
+
         this._checkConnectionState();
 
         this.menu.connect('open-state-changed', Lang.bind(this, this.recalcLayout));
-        if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION)) {
-            this._needsColorUpdate = true;
-            let context = St.ThemeContext.get_for_stage(global.stage);
-            this._globalThemeChangedId = context.connect('changed', Lang.bind(this, function(){this._needsColorUpdate = true;}));
+    },
+
+    _onStatusChanged: function(status) {
+        this._idle = false;
+
+        if (status == GnomeSession.PresenceStatus.IDLE) {
+            this._idle = true;
         }
     },
 
     stop: function() {
+        _forecastWeatherCache = this.forecastWeatherCache;
+        _currentWeatherCache = this.currentWeatherCache;
+
         if (_httpSession !== undefined)
             _httpSession.abort();
 
@@ -270,6 +323,11 @@
 
         this._timeoutForecast = undefined;
 
+        if (this._presence_connection) {
+            this._presence.disconnect(this._presence_connection);
+            this._presence_connection = undefined;
+        }
+
         if (this._network_monitor_connection) {
             this._network_monitor.disconnect(this._network_monitor_connection);
             this._network_monitor_connection = undefined;
@@ -292,30 +350,124 @@
         }
     },
 
+    switchProvider: function() {
+        if (this._weather_provider == WeatherProvider.FORECAST_IO)
+            this.useForecastIo();
+        else
+            this.useOpenweathermapOrg();
+    },
+
+    useOpenweathermapOrg: function() {
+        this.parseWeatherForecast = OpenweathermapOrg.parseWeatherForecast;
+        this.parseWeatherCurrent = OpenweathermapOrg.parseWeatherCurrent;
+        this.getWeatherIcon = OpenweathermapOrg.getWeatherIcon;
+        this.refreshWeatherCurrent = OpenweathermapOrg.refreshWeatherCurrent;
+        this.refreshWeatherForecast = OpenweathermapOrg.refreshWeatherForecast;
+
+        this.weatherProvider = "https://openweathermap.org/";
+
+        if (this._appid.toString().trim() === '')
+            Main.notify("Openweather", _("Openweathermap.org does not work without an api-key.\nEither set the switch to use the extensions default key in the preferences dialog to on or register at http://openweathermap.org/appid and paste your personal key into the preferences dialog."));
+
+    },
+
+    useForecastIo: function() {
+        this.parseWeatherCurrent = ForecastIo.parseWeatherCurrent;
+        this.parseWeatherForecast = ForecastIo.parseWeatherForecast;
+        this.getWeatherIcon = ForecastIo.getWeatherIcon;
+        this.refreshWeatherCurrent = ForecastIo.refreshWeatherCurrent;
+        this.refreshWeatherForecast = function() {};
+
+        this.weatherProvider = "https://forecast.io/";
+
+        this.fc_locale = 'en';
+
+        if (this._translate_condition) {
+            let fc_locales = [
+                'ar',
+                'bs',
+                'de',
+                'el',
+                'en',
+                'es',
+                'fr',
+                'hr',
+                'it',
+                'nl',
+                'pl',
+                'pt',
+                'ru',
+                'sk',
+                'sv',
+                'tet',
+                'tr',
+                'uk',
+                'x-pig-latin',
+                'zh',
+                'zh-tw'
+            ];
+            let locale = GLib.get_language_names()[0];
+
+            if (locale.indexOf('_') != -1)
+                locale = locale.split("_")[0];
+
+            if (fc_locales.indexOf(locale) != -1)
+                this.fc_locale = locale;
+        }
+
+        if (this._appid_fc.toString().trim() === '')
+            Main.notify("Openweather", _("Forecast.io does not work without an api-key.\nPlease register at https://developer.forecast.io/register and paste your personal key into the preferences dialog."));
+    },
+
+    getWeatherProviderURL: function() {
+        let url = "";
+        if (this._weather_provider == WeatherProvider.FORECAST_IO) {
+            url = "https://forecast.io/#/f/";
+            url += this.extractCoord(this._city);
+        } else {
+            url = "https://openweathermap.org";
+            url += "/city/" + this.owmCityId;
+            if (this._appid)
+                url += "?APPID=" + this._appid;
+        }
+        return url;
+    },
+
     loadConfig: function() {
-        this._settings = Convenience.getSettings(WEATHER_SETTINGS_SCHEMA);
+        this._settings = Convenience.getSettings(OPENWEATHER_SETTINGS_SCHEMA);
+
+        if (this._cities.length === 0)
+            this._cities = "-8.5211767,179.1976747>Vaiaku, Tuvalu>-1";
+
         this._settingsC = this._settings.connect("changed", Lang.bind(this, function() {
+            if (this._cities.length === 0)
+                this._cities = "-8.5211767,179.1976747>Vaiaku, Tuvalu>-1";
             this.rebuildCurrentWeatherUi();
             this.rebuildFutureWeatherUi();
-            this.rebuildButtonMenu();
+            if (this.providerChanged()) {
+                this.switchProvider();
+                this.currentWeatherCache = undefined;
+                this.forecastWeatherCache = undefined;
+            }
             if (this.locationChanged()) {
                 this.currentWeatherCache = undefined;
                 this.forecastWeatherCache = undefined;
             }
+            this.rebuildButtonMenu();
             this.parseWeatherCurrent();
         }));
     },
 
     loadConfigInterface: function() {
-        let schemaInterface = "org.gnome.desktop.interface";
-        if (Gio.Settings.list_schemas().indexOf(schemaInterface) == -1)
-            throw _("Schema \"%s\" not found.").replace("%s", schemaInterface);
-        this._settingsInterface = new Gio.Settings({
-            schema: schemaInterface
-        });
+        this._settingsInterface = Convenience.getSettings(OPENWEATHER_DESKTOP_INTERFACE);
         this._settingsInterfaceC = this._settingsInterface.connect("changed", Lang.bind(this, function() {
             this.rebuildCurrentWeatherUi();
             this.rebuildFutureWeatherUi();
+            if (this.providerChanged()) {
+                this.switchProvider();
+                this.currentWeatherCache = undefined;
+                this.forecastWeatherCache = undefined;
+            }
             if (this.locationChanged()) {
                 this.currentWeatherCache = undefined;
                 this.forecastWeatherCache = undefined;
@@ -329,89 +481,122 @@
     },
 
     _checkConnectionState: function() {
-        this._connected = this._network_monitor.network_available;
-        if (this._connected)
+        let url = this.getWeatherProviderURL();
+        let address = Gio.NetworkAddress.parse_uri(url, 80);
+        let cancellable = Gio.Cancellable.new();
+        this._oldConnected = this._connected;
+        this._connected = false;
+        try {
+            this._network_monitor.can_reach_async(address, cancellable, Lang.bind(this, this._asyncReadyCallback));
+        } catch (err) {
+            let title = _("Can not connect to %s").format(url);
+            log(title + '\n' + err.message);
+        }
+    },
+
+    _asyncReadyCallback: function(nm, res) {
+        this._connected = this._network_monitor.can_reach_finish(res);
+        if (!this._oldConnected && this._connected) {
+            let now = new Date();
+            if (_timeCacheCurrentWeather &&
+                (Math.floor(new Date(now - _timeCacheCurrentWeather).getTime() / 1000) > this._refresh_interval_current))
+                this.currentWeatherCache = undefined;
+            if (_timeCacheForecastWeather &&
+                (Math.floor(new Date(now - _timeCacheForecastWeather).getTime() / 1000) > this._refresh_interval_forecast))
+                this.forecastWeatherCache = undefined;
             this.parseWeatherCurrent();
+        }
     },
 
     locationChanged: function() {
-        let location = this.extractId(this._city);
+        let location = this.extractCoord(this._city);
         if (this.oldLocation != location) {
             return true;
         }
         return false;
     },
 
+    providerChanged: function() {
+        let provider = this._weather_provider;
+        if (this.oldProvider != provider) {
+            this.oldProvider = provider;
+            return true;
+        }
+        if (provider == WeatherProvider.OPENWEATHERMAP) {
+            let useDefaultOwmKey = this._use_default_owm_key;
+            if (this.oldUseDefaultOwmKey != useDefaultOwmKey) {
+                this.oldUseDefaultOwmKey = useDefaultOwmKey;
+                return true;
+            }
+        }
+        if (provider == WeatherProvider.FORECAST_IO) {
+            let translateCondition = this._translate_condition;
+            if (this.oldTranslateCondition != translateCondition) {
+                this.oldTranslateCondition = translateCondition;
+                return true;
+            }
+        }
+        return false;
+    },
+
     get _clockFormat() {
         if (!this._settingsInterface)
             this.loadConfigInterface();
         return this._settingsInterface.get_string("clock-format");
     },
 
-    get _units() {
+    get _weather_provider() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_enum(WEATHER_UNIT_KEY);
-    },
 
-    set _units(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_enum(WEATHER_UNIT_KEY, v);
-    },
+        let provider = this.extractProvider(this._city);
 
-    get _wind_speed_units() {
-        if (!this._settings)
-            this.loadConfig();
-        return this._settings.get_enum(WEATHER_WIND_SPEED_UNIT_KEY);
-    },
+        if (provider == WeatherProvider.DEFAULT)
+            provider = this._settings.get_enum(OPENWEATHER_PROVIDER_KEY);
 
-    set _wind_speed_units(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_enum(WEATHER_WIND_SPEED_UNIT_KEY, v);
+        return provider;
     },
 
-    get _wind_direction() {
+    get _units() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_boolean(WEATHER_WIND_DIRECTION_KEY);
+        return this._settings.get_enum(OPENWEATHER_UNIT_KEY);
     },
 
-    set _wind_direction(v) {
+    get _wind_speed_units() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.set_boolean(WEATHER_WIND_DIRECTION_KEY, v);
+        return this._settings.get_enum(OPENWEATHER_WIND_SPEED_UNIT_KEY);
     },
 
-    get _pressure_units() {
+    get _wind_direction() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_enum(WEATHER_PRESSURE_UNIT_KEY);
+        return this._settings.get_boolean(OPENWEATHER_WIND_DIRECTION_KEY);
     },
 
-    set _pressure_units(v) {
+    get _pressure_units() {
         if (!this._settings)
             this.loadConfig();
-        this._settings.set_enum(WEATHER_PRESSURE_UNIT_KEY, v);
+        return this._settings.get_enum(OPENWEATHER_PRESSURE_UNIT_KEY);
     },
 
     get _cities() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_string(WEATHER_CITY_KEY);
+        return this._settings.get_string(OPENWEATHER_CITY_KEY);
     },
 
     set _cities(v) {
         if (!this._settings)
             this.loadConfig();
-        this._settings.set_string(WEATHER_CITY_KEY, v);
+        return this._settings.set_string(OPENWEATHER_CITY_KEY, v);
     },
 
     get _actual_city() {
         if (!this._settings)
             this.loadConfig();
-        var a = this._settings.get_int(WEATHER_ACTUAL_CITY_KEY);
+        var a = this._settings.get_int(OPENWEATHER_ACTUAL_CITY_KEY);
         var b = a;
         var cities = this._cities.split(" && ");
 
@@ -451,7 +636,7 @@
         if (a > l)
             a = l;
 
-        this._settings.set_int(WEATHER_ACTUAL_CITY_KEY, a);
+        this._settings.set_int(OPENWEATHER_ACTUAL_CITY_KEY, a);
     },
 
     get _city() {
@@ -465,237 +650,114 @@
         return cities;
     },
 
-    set _city(v) {
-        let cities = this._cities;
-        cities = cities.split(" && ");
-        if (cities && typeof cities == "string")
-            cities = [cities];
-        if (!cities[0])
-            cities = [];
-        cities.splice(this.actual_city, 1, v);
-        cities = cities.join(" && ");
-        if (typeof cities != "string")
-            cities = cities[0];
-        this._cities = cities;
-    },
-
     get _translate_condition() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_boolean(WEATHER_TRANSLATE_CONDITION_KEY);
+        return this._settings.get_boolean(OPENWEATHER_TRANSLATE_CONDITION_KEY);
     },
 
-    set _translate_condition(v) {
+    get _getIconType() {
         if (!this._settings)
             this.loadConfig();
-        this._settings.set_boolean(WEATHER_TRANSLATE_CONDITION_KEY, v);
-    },
-
-    get _icon_type() {
-        if (!this._settings)
-            this.loadConfig();
-        return this._settings.get_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY) ? 1 : 0;
-    },
-
-    set _icon_type(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY, v);
+        return this._settings.get_boolean(OPENWEATHER_USE_SYMBOLIC_ICONS_KEY) ? 1 : 0;
     },
 
     get _use_text_on_buttons() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_boolean(WEATHER_USE_TEXT_ON_BUTTONS_KEY) ? 1 : 0;
-    },
-
-    set _use_text_on_buttons(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_boolean(WEATHER_USE_TEXT_ON_BUTTONS_KEY, v);
+        return this._settings.get_boolean(OPENWEATHER_USE_TEXT_ON_BUTTONS_KEY) ? 1 : 0;
     },
 
     get _text_in_panel() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY);
-    },
-
-    set _text_in_panel(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY, v);
+        return this._settings.get_boolean(OPENWEATHER_SHOW_TEXT_IN_PANEL_KEY);
     },
 
     get _position_in_panel() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_enum(WEATHER_POSITION_IN_PANEL_KEY);
-    },
-
-    set _position_in_panel(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_enum(WEATHER_POSITION_IN_PANEL_KEY, v);
+        return this._settings.get_enum(OPENWEATHER_POSITION_IN_PANEL_KEY);
     },
 
     get _comment_in_panel() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY);
+        return this._settings.get_boolean(OPENWEATHER_SHOW_COMMENT_IN_PANEL_KEY);
     },
 
-    set _comment_in_panel(v) {
+    get _comment_in_forecast() {
         if (!this._settings)
             this.loadConfig();
-        this._settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v);
+        return this._settings.get_boolean(OPENWEATHER_SHOW_COMMENT_IN_FORECAST_KEY);
     },
 
     get _refresh_interval_current() {
         if (!this._settings)
             this.loadConfig();
-        let v = this._settings.get_int(WEATHER_REFRESH_INTERVAL_CURRENT);
+        let v = this._settings.get_int(OPENWEATHER_REFRESH_INTERVAL_CURRENT);
         return ((v >= 600) ? v : 600);
     },
 
-    set _refresh_interval_current(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_int(WEATHER_REFRESH_INTERVAL_CURRENT, ((v >= 600) ? v : 600));
-    },
-
     get _refresh_interval_forecast() {
         if (!this._settings)
             this.loadConfig();
-        let v = this._settings.get_int(WEATHER_REFRESH_INTERVAL_FORECAST);
+        let v = this._settings.get_int(OPENWEATHER_REFRESH_INTERVAL_FORECAST);
         return ((v >= 600) ? v : 600);
     },
 
-    set _refresh_interval_forecast(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_int(WEATHER_REFRESH_INTERVAL_FORECAST, ((v >= 600) ? v : 600));
-    },
-
     get _center_forecast() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_boolean(WEATHER_CENTER_FORECAST_KEY);
-    },
-
-    set _center_forecast(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_boolean(WEATHER_CENTER_FORECAST_KEY, v);
+        return this._settings.get_boolean(OPENWEATHER_CENTER_FORECAST_KEY);
     },
 
     get _days_forecast() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_int(WEATHER_DAYS_FORECAST);
-    },
-
-    set _days_forecast(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_int(WEATHER_DAYS_FORECAST, v);
+        return this._settings.get_int(OPENWEATHER_DAYS_FORECAST);
     },
 
     get _decimal_places() {
         if (!this._settings)
             this.loadConfig();
-        return this._settings.get_int(WEATHER_DECIMAL_PLACES);
-    },
-
-    set _decimal_places(v) {
-        if (!this._settings)
-            this.loadConfig();
-        this._settings.set_int(WEATHER_DECIMAL_PLACES, v);
+        return this._settings.get_int(OPENWEATHER_DECIMAL_PLACES);
     },
 
     get _appid() {
         if (!this._settings)
             this.loadConfig();
-        let key = this._settings.get_string(WEATHER_OWM_API_KEY);
+        let key = '';
+        if (this._use_default_owm_key)
+            key = OPENWEATHER_OWM_DEFAULT_API_KEY;
+        else
+            key = this._settings.get_string(OPENWEATHER_OWM_API_KEY);
         return (key.length == 32) ? key : '';
     },
 
-    set _appid(v) {
+    get _use_default_owm_key() {
         if (!this._settings)
             this.loadConfig();
-        this._settings.set_string(WEATHER_OWM_API_KEY, v);
+        return this._settings.get_boolean(OPENWEATHER_USE_DEFAULT_OWM_API_KEY);
     },
 
-    createButton: function(iconName, accessibleName) {
-        let button;
-
-        if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION)) {
-            button = new St.Button({
-                reactive: true,
-                can_focus: true,
-                track_hover: true,
-                accessible_name: accessibleName,
-                style_class: 'popup-menu-item openweather-button'
-            });
-            button.child = new St.Icon({
-                icon_name: iconName
-            });
-            button.connect('notify::hover', Lang.bind(this, this._onButtonHoverChanged));
-        } else
-            button = Main.panel.statusArea.aggregateMenu._system._createActionButton(iconName, accessibleName);
-
-        return button;
-    },
-
-    _onButtonHoverChanged: function(actor, event) {
-        if (actor.hover) {
-            actor.add_style_pseudo_class('hover');
-            actor.set_style(this._button_background_style);
-        } else {
-            actor.remove_style_pseudo_class('hover');
-            actor.set_style('background-color:;');
-            if (actor != this._urlButton)
-                actor.set_style(this._button_border_style);
-            }
-    },
-
-    _updateButtonColors: function() {
-        if (!this._needsColorUpdate)
-            return;
-            this._needsColorUpdate = false;
-        let color;
-        if (ExtensionUtils.versionCheck(['3.6'], Config.PACKAGE_VERSION))
-            color = this._separatorItem._drawingArea.get_theme_node().get_color('-gradient-end');
-        else
-            color = this._separatorItem._separator.actor.get_theme_node().get_color('-gradient-end');
-
-            let alpha = (Math.round(color.alpha / 2.55) / 100);
-
-            if (color.red > 0 && color.green > 0 && color.blue > 0)
-                this._button_border_style = 'border:1px solid rgb(' + Math.round(alpha * color.red) + ',' + Math.round(alpha * color.green) + ',' + Math.round(alpha * color.blue) + ');';
-            else
-                this._button_border_style = 'border:1px solid rgba(' + color.red + ',' + color.green + ',' + color.blue + ',' + alpha + ');';
-
-            this._locationButton.set_style(this._button_border_style);
-            this._reloadButton.set_style(this._button_border_style);
-            this._prefsButton.set_style(this._button_border_style);
-
-            this._buttonMenu.actor.add_style_pseudo_class('active');
-            color = this._buttonMenu.actor.get_theme_node().get_background_color();
-            this._button_background_style = 'background-color:rgba(' + color.red + ',' + color.green + ',' + color.blue + ',' + (Math.round(color.alpha / 2.55) / 100) + ');';
-            this._buttonMenu.actor.remove_style_pseudo_class('active');
+    get _appid_fc() {
+        if (!this._settings)
+            this.loadConfig();
+        let key = this._settings.get_string(OPENWEATHER_FC_API_KEY);
+        return (key.length == 32) ? key : '';
     },
 
     rebuildButtonMenu: function() {
         if (this._buttonBox) {
-        if (this._buttonBox1) {
-            this._buttonBox1.destroy();
-            this._buttonBox1 = undefined;
+            if (this._buttonBox1) {
+                this._buttonBox1.destroy();
+                this._buttonBox1 = undefined;
 
-        }
-        if (this._buttonBox2) {
-            this._buttonBox2.destroy();
-            this._buttonBox2 = undefined;
+            }
+            if (this._buttonBox2) {
+                this._buttonBox2.destroy();
+                this._buttonBox2 = undefined;
             }
             this._buttonMenu.removeActor(this._buttonBox);
             this._buttonBox.destroy();
@@ -711,22 +773,19 @@
             this._buttonBox2 = undefined;
         }
 
-        this._locationButton = this.createButton('find-location-symbolic', _("Locations"));
+        this._locationButton = Main.panel.statusArea.aggregateMenu._system._createActionButton('find-location-symbolic', _("Locations"));
         if (this._use_text_on_buttons)
             this._locationButton.set_label(this._locationButton.get_accessible_name());
 
         this._locationButton.connect('clicked', Lang.bind(this, function() {
-            if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION))
-                this._selectCity.menu.toggle();
-            else
-               this._selectCity._setOpenState(!this._selectCity._getOpenState());
+            this._selectCity._setOpenState(!this._selectCity._getOpenState());
         }));
         this._buttonBox1 = new St.BoxLayout({
             style_class: 'openweather-button-box'
         });
         this._buttonBox1.add_actor(this._locationButton);
 
-        this._reloadButton = this.createButton('view-refresh-symbolic', _("Reload Weather Information"));
+        this._reloadButton = Main.panel.statusArea.aggregateMenu._system._createActionButton('view-refresh-symbolic', _("Reload Weather Information"));
         if (this._use_text_on_buttons)
             this._reloadButton.set_label(this._reloadButton.get_accessible_name());
         this._reloadButton.connect('clicked', Lang.bind(this, function() {
@@ -737,30 +796,17 @@
         }));
         this._buttonBox1.add_actor(this._reloadButton);
 
-
         this._buttonBox2 = new St.BoxLayout({
             style_class: 'openweather-button-box'
         });
 
-        this._urlButton = new St.Button({
-            label: _("Weather data provided by:") + (this._use_text_on_buttons ? "\n" : "  ") + "http://openweathermap.org/",
-            style_class: 'system-menu-action openweather-provider'
-        });
-        if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION)) {
-            this._urlButton.connect('notify::hover', Lang.bind(this, this._onButtonHoverChanged));
-        }
+        this._urlButton = Main.panel.statusArea.aggregateMenu._system._createActionButton('', _("Weather data provided by:") + (this._use_text_on_buttons ? "\n" : "  ") + this.weatherProvider);
+        this._urlButton.set_label(this._urlButton.get_accessible_name());
+        this._urlButton.style_class += ' openweather-provider';
+
         this._urlButton.connect('clicked', Lang.bind(this, function() {
             this.menu.actor.hide();
-            let cityId = this.extractId(this._city);
-            if (!cityId) {
-                this.updateCities();
-                cityId = this.extractId(this._city);
-            }
-            let url = "http://openweathermap.org";
-            if (cityId)
-                url += "/city/" + cityId;
-            if (this._appid)
-                url += "?APPID=" + this._appid;
+            let url = this.getWeatherProviderURL();
 
             try {
                 Gtk.show_uri(null, url, global.get_current_time());
@@ -772,28 +818,18 @@
 
         this._buttonBox2.add_actor(this._urlButton);
 
-
-        this._prefsButton = this.createButton('preferences-system-symbolic', _("Weather Settings"));
+        this._prefsButton = Main.panel.statusArea.aggregateMenu._system._createActionButton('preferences-system-symbolic', _("Weather Settings"));
         if (this._use_text_on_buttons)
             this._prefsButton.set_label(this._prefsButton.get_accessible_name());
         this._prefsButton.connect('clicked', Lang.bind(this, this._onPreferencesActivate));
         this._buttonBox2.add_actor(this._prefsButton);
 
-        if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION)) {
-            this._buttonBox = new St.BoxLayout();
-            this._buttonBox1.add_style_class_name('openweather-button-box-38');
-            this._buttonBox2.add_style_class_name('openweather-button-box-38');
-            this._buttonBox.add_actor(this._buttonBox1);
-            this._buttonBox.add_actor(this._buttonBox2);
+        this._buttonMenu.actor.add_actor(this._buttonBox1);
+        this._buttonMenu.actor.add_actor(this._buttonBox2);
 
-            this._buttonMenu.addActor(this._buttonBox);
-            this._needsColorUpdate = true;
-        } else {
-            this._buttonMenu.actor.add_actor(this._buttonBox1);
-            this._buttonMenu.actor.add_actor(this._buttonBox2);
-        }
         this._buttonBox1MinWidth = undefined;
     },
+
     rebuildSelectCityItem: function() {
         this._selectCity.menu.removeAll();
         let item = null;
@@ -809,10 +845,7 @@
             item = new PopupMenu.PopupMenuItem(this.extractLocation(cities[i]));
             item.location = i;
             if (i == this._actual_city) {
-                if (ExtensionUtils.versionCheck(['3.6', '3.8'], Config.PACKAGE_VERSION))
-                    item.setShowDot(true);
-                else
-                    item.setOrnament(PopupMenu.Ornament.DOT);
+                item.setOrnament(PopupMenu.Ornament.DOT);
             }
 
             this._selectCity.menu.addMenuItem(item);
@@ -840,73 +873,28 @@
         return arguments[0].split(">")[1];
     },
 
-    extractCity: function() {
-        if (!arguments[0])
-            return "";
-        let city = this.extractLocation(arguments[0]);
-        if (city.indexOf("(") == -1)
-            return _("Invalid city");
-        return city.split("(")[0].trim();
-    },
+    extractCoord: function() {
+        let coords = 0;
 
-    extractId: function() {
-        if (!arguments[0])
-            return 0;
+        if (arguments[0] && (arguments[0].search(">") != -1))
+            coords = arguments[0].split(">")[0];
 
-        if (arguments[0].search(">") == -1)
+        if ((coords.search(",") == -1) || isNaN(coords.split(",")[0]) || isNaN(coords.split(",")[1])) {
+            Main.notify("Openweather", _("Invalid location! Please try to recreate it."));
             return 0;
-        return arguments[0].split(">")[0];
-    },
-
-    updateCities: function() {
-        let cities = this._cities;
-
-        cities = cities.split(" && ");
-        if (cities && typeof cities == "string")
-            cities = [cities];
-        if (!cities[0])
-            cities = [];
-
-        if (cities.length === 0) {
-            this._cities = "2516479>Eivissa (CA)";
-            this.updateCities();
-            return;
         }
 
-        for (let a in cities) {
-            if (!this.extractCity(cities[a])) {
-                let params = {
-                    q: cities[a],
-                    type: 'like'
-                };
-                if (this._appid)
-                    params.APPID = this._appid;
-
-                this.load_json_async(WEATHER_URL_CURRENT, params, Lang.bind(this, this._updateCitiesCallback));
-                return;
-            } else
-                continue;
-        }
+        return coords;
     },
 
-    _updateCitiesCallback: function() {
-        let city = arguments[0];
-
-        if (Number(city.cod) != 200)
-            return;
-
-        let cityText = city.id + ">" + city.name;
-
-        if (city.sys)
-            cityText += " (" + city.sys.country + ")";
-
-        cities.splice(a, 1, cityText);
-
-        cities = cities.join(" && ");
-        if (typeof cities != "string")
-            cities = cities[0];
-        this._cities = cities;
-        this.updateCities();
+    extractProvider: function() {
+        if (!arguments[0])
+            return -1;
+        if (arguments[0].split(">")[2] === undefined)
+            return -1;
+        if (isNaN(parseInt(arguments[0].split(">")[2])))
+            return -1;
+        return parseInt(arguments[0].split(">")[2]);
     },
 
     _onPreferencesActivate: function() {
@@ -918,8 +906,7 @@
     recalcLayout: function() {
         if (!this.menu.isOpen)
             return;
-        this._updateButtonColors();
-        if(this._buttonBox1MinWidth === undefined)
+        if (this._buttonBox1MinWidth === undefined)
             this._buttonBox1MinWidth = this._buttonBox1.get_width();
         this._buttonBox1.set_width(Math.max(this._buttonBox1MinWidth, this._currentWeather.get_width() - this._buttonBox2.get_width()));
         if (this._forecastScrollBox !== undefined && this._forecastBox !== undefined && this._currentWeather !== undefined) {
@@ -954,240 +941,8 @@
             return '\u00B0C';
     },
 
-    get_weather_icon: function(code) {
-        // see http://bugs.openweathermap.org/projects/api/wiki/Weather_Condition_Codes
-        // fallback icons are: weather-clear-night weather-clear weather-few-clouds-night weather-few-clouds weather-fog weather-overcast weather-severe-alert weather-showers weather-showers-scattered weather-snow weather-storm
-        /*
-weather-clouds-night.png
-weather-freezing-rain.png
-weather-hail.png
-weather-many-clouds.png
-weather-showers-day.png
-weather-showers-night.png
-weather-showers-scattered-day.png
-weather-showers-scattered-night.png
-weather-snow-rain.png
-weather-snow-scattered-day.png
-weather-snow-scattered-night.png
-weather-snow-scattered.png
-weather-storm-day.png
-weather-storm-night.png
-
-weather-severe-alert-symbolic.svg
-
-
-weather-clear-night.png = weather-clear-night-symbolic.svg
-weather-clear.png = weather-clear-symbolic.svg
-weather-clouds.png = weather-overcast-symbolic.svg
-weather-few-clouds-night.png = weather-few-clouds-night-symbolic.svg
-weather-few-clouds.png = weather-few-clouds-symbolic.svg
-weather-mist.png = weather-fog-symbolic.svg
-weather-showers-scattered.png = weather-showers-scattered-symbolic.svg
-weather-showers.png = weather-showers-symbolic.svg
-weather-snow.png = weather-snow-symbolic.svg
-weather-storm.png = weather-storm-symbolic.svg
-
-*/
-        switch (parseInt(code, 10)) {
-            case 200: //thunderstorm with light rain
-            case 201: //thunderstorm with rain
-            case 202: //thunderstorm with heavy rain
-            case 210: //light thunderstorm
-            case 211: //thunderstorm
-            case 212: //heavy thunderstorm
-            case 221: //ragged thunderstorm
-            case 230: //thunderstorm with light drizzle
-            case 231: //thunderstorm with drizzle
-            case 232: //thunderstorm with heavy drizzle
-                return ['weather-storm'];
-            case 300: //light intensity drizzle
-            case 301: //drizzle
-            case 302: //heavy intensity drizzle
-            case 310: //light intensity drizzle rain
-            case 311: //drizzle rain
-            case 312: //heavy intensity drizzle rain
-            case 313: //shower rain and drizzle
-            case 314: //heavy shower rain and drizzle
-            case 321: //shower drizzle
-                return ['weather-showers'];
-            case 500: //light rain
-            case 501: //moderate rain
-            case 502: //heavy intensity rain
-            case 503: //very heavy rain
-            case 504: //extreme rain
-                return ['weather-showers-scattered', 'weather-showers'];
-            case 511: //freezing rain
-                return ['weather-freezing-rain', 'weather-showers'];
-            case 520: //light intensity shower rain
-            case 521: //shower rain
-            case 522: //heavy intensity shower rain
-            case 531: //ragged shower rain
-                return ['weather-showers'];
-            case 600: //light snow
-            case 601: //snow
-            case 602: //heavy snow
-            case 611: //sleet
-            case 612: //shower sleet
-            case 615: //light rain and snow
-            case 616: //rain and snow
-            case 620: //light shower snow
-            case 621: //shower snow
-            case 622: //heavy shower snow
-                return ['weather-snow'];
-            case 701: //mist
-            case 711: //smoke
-            case 721: //haze
-            case 741: //Fog
-                return ['weather-fog'];
-            case 731: //Sand/Dust Whirls
-            case 751: //sand
-            case 761: //dust
-            case 762: //VOLCANIC ASH
-            case 771: //SQUALLS
-            case 781: //TORNADO
-                return ['weather-severe-alert'];
-            case 800: //sky is clear
-                return ['weather-clear'];
-            case 801: //few clouds
-            case 802: //scattered clouds
-                return ['weather-few-clouds'];
-            case 803: //broken clouds
-                return ['weather-many-clouds', 'weather-overcast'];
-            case 804: //overcast clouds
-                return ['weather-overcast'];
-            default:
-                return ['weather-severe-alert'];
-        }
-    },
-
-    get_weather_icon_safely: function(code, night) {
-        let iconname = this.get_weather_icon(code);
-        for (let i = 0; i < iconname.length; i++) {
-            if (night && this.has_icon(iconname[i] + '-night'))
-                return iconname[i] + '-night' + this.icon_type();
-            if (this.has_icon(iconname[i]))
-                return iconname[i] + this.icon_type();
-        }
-        return 'weather-severe-alert' + this.icon_type();
-    },
-
-    has_icon: function(icon) {
-        return Gtk.IconTheme.get_default().has_icon(icon + this.icon_type());
-    },
-
-    get_weather_condition: function(code) {
-        switch (parseInt(code, 10)) {
-            case 200: //thunderstorm with light rain
-                return _('thunderstorm with light rain');
-            case 201: //thunderstorm with rain
-                return _('thunderstorm with rain');
-            case 202: //thunderstorm with heavy rain
-                return _('thunderstorm with heavy rain');
-            case 210: //light thunderstorm
-                return _('light thunderstorm');
-            case 211: //thunderstorm
-                return _('thunderstorm');
-            case 212: //heavy thunderstorm
-                return _('heavy thunderstorm');
-            case 221: //ragged thunderstorm
-                return _('ragged thunderstorm');
-            case 230: //thunderstorm with light drizzle
-                return _('thunderstorm with light drizzle');
-            case 231: //thunderstorm with drizzle
-                return _('thunderstorm with drizzle');
-            case 232: //thunderstorm with heavy drizzle
-                return _('thunderstorm with heavy drizzle');
-            case 300: //light intensity drizzle
-                return _('light intensity drizzle');
-            case 301: //drizzle
-                return _('drizzle');
-            case 302: //heavy intensity drizzle
-                return _('heavy intensity drizzle');
-            case 310: //light intensity drizzle rain
-                return _('light intensity drizzle rain');
-            case 311: //drizzle rain
-                return _('drizzle rain');
-            case 312: //heavy intensity drizzle rain
-                return _('heavy intensity drizzle rain');
-            case 313: //shower rain and drizzle
-                return _('shower rain and drizzle');
-            case 314: //heavy shower rain and drizzle
-                return _('heavy shower rain and drizzle');
-            case 321: //shower drizzle
-                return _('shower drizzle');
-            case 500: //light rain
-                return _('light rain');
-            case 501: //moderate rain
-                return _('moderate rain');
-            case 502: //heavy intensity rain
-                return _('heavy intensity rain');
-            case 503: //very heavy rain
-                return _('very heavy rain');
-            case 504: //extreme rain
-                return _('extreme rain');
-            case 511: //freezing rain
-                return _('freezing rain');
-            case 520: //light intensity shower rain
-                return _('light intensity shower rain');
-            case 521: //shower rain
-                return _('shower rain');
-            case 522: //heavy intensity shower rain
-                return _('heavy intensity shower rain');
-            case 531: //ragged shower rain
-                return _('ragged shower rain');
-            case 600: //light snow
-                return _('light snow');
-            case 601: //snow
-                return _('snow');
-            case 602: //heavy snow
-                return _('heavy snow');
-            case 611: //sleet
-                return _('sleet');
-            case 612: //shower sleet
-                return _('shower sleet');
-            case 615: //light rain and snow
-                return _('light rain and snow');
-            case 616: //rain and snow
-                return _('rain and snow');
-            case 620: //light shower snow
-                return _('light shower snow');
-            case 621: //shower snow
-                return _('shower snow');
-            case 622: //heavy shower snow
-                return _('heavy shower snow');
-            case 701: //mist
-                return _('mist');
-            case 711: //smoke
-                return _('smoke');
-            case 721: //haze
-                return _('haze');
-            case 731: //Sand/Dust Whirls
-                return _('Sand/Dust Whirls');
-            case 741: //Fog
-                return _('Fog');
-            case 751: //sand
-                return _('sand');
-            case 761: //dust
-                return _('dust');
-            case 762: //VOLCANIC ASH
-                return _('VOLCANIC ASH');
-            case 771: //SQUALLS
-                return _('SQUALLS');
-            case 781: //TORNADO
-                return _('TORNADO');
-            case 800: //sky is clear
-                return _('sky is clear');
-            case 801: //few clouds
-                return _('few clouds');
-            case 802: //scattered clouds
-                return _('scattered clouds');
-            case 803: //broken clouds
-                return _('broken clouds');
-            case 804: //overcast clouds
-                return _('overcast clouds');
-            default:
-                return _('Not available');
-        }
+    hasIcon: function(icon) {
+        return Gtk.IconTheme.get_default().has_icon(icon + this.getIconType());
     },
 
     toFahrenheit: function(t) {
@@ -1263,26 +1018,26 @@
             return (!t) ? "12" : "(" + _("Hurricane") + ")";
     },
 
-    get_locale_day: function(abr) {
+    getLocaleDay: function(abr) {
         let days = [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')];
         return days[abr];
     },
 
-    get_wind_direction: function(deg) {
+    getWindDirection: function(deg) {
         let arrows = ["\u2193", "\u2199", "\u2190", "\u2196", "\u2191", "\u2197", "\u2192", "\u2198"];
         let letters = [_('N'), _('NE'), _('E'), _('SE'), _('S'), _('SW'), _('W'), _('NW')];
         let idx = Math.round(deg / 45) % arrows.length;
         return (this._wind_direction) ? arrows[idx] : letters[idx];
     },
 
-    icon_type: function(icon_name) {
+    getIconType: function(icon_name) {
         if (!icon_name)
-            if (this._icon_type)
+            if (this._getIconType)
                 return "-symbolic";
             else
                 return "";
 
-        if (this._icon_type)
+        if (this._getIconType)
             if (String(icon_name).search("-symbolic") != -1)
                 return icon_name;
             else
@@ -1296,18 +1051,16 @@
 
     load_json_async: function(url, params, fun) {
         if (_httpSession === undefined) {
-            if (ExtensionUtils.versionCheck(['3.6'], Config.PACKAGE_VERSION)) {
-                // Soup session (see https://bugzilla.gnome.org/show_bug.cgi?id=661323#c64) (Simon Legner)
-                _httpSession = new Soup.SessionAsync();
-                Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
-            } else
-                _httpSession = new Soup.Session();
+            _httpSession = new Soup.Session();
+            _httpSession.user_agent = this.user_agent;
+        } else {
+            // abort previous requests.
+            _httpSession.abort();
         }
 
         let message = Soup.form_request_new_from_hash('GET', url, params);
 
         _httpSession.queue_message(message, Lang.bind(this, function(_httpSession, message) {
-
             try {
                 if (!message.response_body.data) {
                     fun.call(this, 0);
@@ -1323,12 +1076,7 @@
         return;
     },
 
-    parseWeatherCurrent: function() {
-        if (this.currentWeatherCache === undefined) {
-            this.refreshWeatherCurrent();
-            return;
-        }
-
+    checkPositionInPanel: function() {
         if (this._old_position_in_panel != this._position_in_panel) {
             switch (this._old_position_in_panel) {
                 case WeatherPosition.LEFT:
@@ -1360,88 +1108,65 @@
             this._old_position_in_panel = this._position_in_panel;
         }
 
-        let json = this.currentWeatherCache;
-        // Refresh current weather
-        let location = this.extractLocation(this._city);
-
-        let comment = json.weather[0].description;
-        if (this._translate_condition)
-            comment = this.get_weather_condition(json.weather[0].id);
-
-        let temperature = json.main.temp;
-        let cloudiness = json.clouds.all;
-        let humidity = json.main.humidity + ' %';
-        let pressure = json.main.pressure;
-        let pressure_unit = 'hPa';
-
-        let wind_direction = this.get_wind_direction(json.wind.deg);
-        let wind = json.wind.speed;
-        let wind_unit = 'm/s';
-
-        let sunrise = new Date(json.sys.sunrise * 1000);
-        let sunset = new Date(json.sys.sunset * 1000);
-        let now = new Date();
-
-        let iconname = this.get_weather_icon_safely(json.weather[0].id, now < sunrise || now > sunset);
-
-        if (this.lastBuildId === undefined)
-            this.lastBuildId = 0;
-
-        if (this.lastBuildDate === undefined)
-            this.lastBuildDate = 0;
-
-        if (this.lastBuildId != json.dt || !this.lastBuildDate) {
-            this.lastBuildId = json.dt;
-            this.lastBuildDate = new Date(this.lastBuildId * 1000);
-        }
+    },
 
+    formatPressure: function(pressure) {
+        let pressure_unit = 'hPa';
         switch (this._pressure_units) {
-            case WeatherPressureUnits.inHg:
+            case WeatherPressureUnits.INHG:
                 pressure = this.toInHg(pressure);
                 pressure_unit = "inHg";
                 break;
 
-            case WeatherPressureUnits.hPa:
+            case WeatherPressureUnits.HPA:
                 pressure = pressure.toFixed(this._decimal_places);
                 pressure_unit = "hPa";
                 break;
 
-            case WeatherPressureUnits.bar:
+            case WeatherPressureUnits.BAR:
                 pressure = (pressure / 1000).toFixed(this._decimal_places);
                 pressure_unit = "bar";
                 break;
 
-            case WeatherPressureUnits.Pa:
+            case WeatherPressureUnits.PA:
                 pressure = (pressure * 100).toFixed(this._decimal_places);
                 pressure_unit = "Pa";
                 break;
 
-            case WeatherPressureUnits.kPa:
+            case WeatherPressureUnits.KPA:
                 pressure = (pressure / 10).toFixed(this._decimal_places);
                 pressure_unit = "kPa";
                 break;
 
-            case WeatherPressureUnits.atm:
+            case WeatherPressureUnits.ATM:
                 pressure = (pressure * 0.000986923267).toFixed(this._decimal_places);
                 pressure_unit = "atm";
                 break;
 
-            case WeatherPressureUnits.at:
+            case WeatherPressureUnits.AT:
                 pressure = (pressure * 0.00101971621298).toFixed(this._decimal_places);
                 pressure_unit = "at";
                 break;
 
-            case WeatherPressureUnits.Torr:
+            case WeatherPressureUnits.TORR:
                 pressure = (pressure * 0.750061683).toFixed(this._decimal_places);
                 pressure_unit = "Torr";
                 break;
 
-            case WeatherPressureUnits.psi:
+            case WeatherPressureUnits.PSI:
                 pressure = (pressure * 0.0145037738).toFixed(this._decimal_places);
                 pressure_unit = "psi";
                 break;
+
+            case WeatherPressureUnits.MMHG:
+                pressure = (pressure * 0.750061683).toFixed(this._decimal_places);
+                pressure_unit = "mmHg";
+                break;
         }
+        return parseFloat(pressure).toLocaleString() + ' ' + pressure_unit;
+    },
 
+    formatTemperature: function(temperature) {
         switch (this._units) {
             case WeatherUnits.FAHRENHEIT:
                 temperature = this.toFahrenheit(temperature);
@@ -1475,266 +1200,77 @@
                 temperature = this.toNewton(temperature);
                 break;
         }
+        return parseFloat(temperature).toLocaleString() + ' ' + this.unit_to_unicode();
+    },
 
-        let lastBuild = '-';
-
-        if (this._clockFormat == "24h") {
-            sunrise = sunrise.toLocaleFormat("%R");
-            sunset = sunset.toLocaleFormat("%R");
-            lastBuild = this.lastBuildDate.toLocaleFormat("%R");
-        } else {
-            sunrise = sunrise.toLocaleFormat("%I:%M %p");
-            sunset = sunset.toLocaleFormat("%I:%M %p");
-            lastBuild = this.lastBuildDate.toLocaleFormat("%I:%M %p");
-        }
-
-        let beginOfDay = new Date(new Date().setHours(0, 0, 0, 0));
-        let d = Math.floor((this.lastBuildDate.getTime() - beginOfDay.getTime()) / 86400000);
-        if (d < 0) {
-            lastBuild = _("Yesterday");
-            if (d < -1)
-                lastBuild = _("%s days ago").replace("%s", -1 * d);
-        }
-
-        this._currentWeatherIcon.icon_name = this._weatherIcon.icon_name = iconname;
-
-        let weatherInfoC = "";
-        let weatherInfoT = "";
-
-        if (this._comment_in_panel)
-            weatherInfoC = comment;
-
-        if (this._text_in_panel)
-            weatherInfoT = parseFloat(temperature).toLocaleString() + ' ' + this.unit_to_unicode();
-
-        this._weatherInfo.text = weatherInfoC + ((weatherInfoC && weatherInfoT) ? ", " : "") + weatherInfoT;
-
-        this._currentWeatherSummary.text = comment + ", " + parseFloat(temperature).toLocaleString() + ' ' + this.unit_to_unicode();
-        this._currentWeatherLocation.text = location;
-        this._currentWeatherTemperature.text = cloudiness + ' %';
-        this._currentWeatherHumidity.text = parseFloat(humidity).toLocaleString() + ' %';
-        this._currentWeatherPressure.text = parseFloat(pressure).toLocaleString() + ' ' + pressure_unit;
-        this._currentWeatherSunrise.text = sunrise;
-        this._currentWeatherSunset.text = sunset;
-        this._currentWeatherBuild.text = lastBuild;
-
-        // Override wind units with our preference
+    formatWind: function(speed, direction) {
+        let unit = 'm/s';
         switch (this._wind_speed_units) {
             case WeatherWindSpeedUnits.MPH:
-                wind = (wind * WEATHER_CONV_MPS_IN_MPH).toFixed(this._decimal_places);
-                wind_unit = 'mph';
+                speed = (speed * OPENWEATHER_CONV_MPS_IN_MPH).toFixed(this._decimal_places);
+                unit = 'mph';
                 break;
 
             case WeatherWindSpeedUnits.KPH:
-                wind = (wind * WEATHER_CONV_MPS_IN_KPH).toFixed(this._decimal_places);
-                wind_unit = 'km/h';
+                speed = (speed * OPENWEATHER_CONV_MPS_IN_KPH).toFixed(this._decimal_places);
+                unit = 'km/h';
                 break;
 
             case WeatherWindSpeedUnits.MPS:
-                wind = wind.toFixed(this._decimal_places);
+                speed = speed.toFixed(this._decimal_places);
                 break;
 
             case WeatherWindSpeedUnits.KNOTS:
-                wind = (wind * WEATHER_CONV_MPS_IN_KNOTS).toFixed(this._decimal_places);
-                wind_unit = 'kn';
+                speed = (speed * OPENWEATHER_CONV_MPS_IN_KNOTS).toFixed(this._decimal_places);
+                unit = 'kn';
                 break;
 
             case WeatherWindSpeedUnits.FPS:
-                wind = (wind * WEATHER_CONV_MPS_IN_FPS).toFixed(this._decimal_places);
-                wind_unit = 'ft/s';
+                speed = (speed * OPENWEATHER_CONV_MPS_IN_FPS).toFixed(this._decimal_places);
+                unit = 'ft/s';
                 break;
 
             case WeatherWindSpeedUnits.BEAUFORT:
-                wind_unit = this.toBeaufort(wind, true);
-                wind = this.toBeaufort(wind);
-        }
-
-        if (!wind)
-            this._currentWeatherWind.text = '\u2013';
-        else if (wind === 0 || !wind_direction)
-            this._currentWeatherWind.text = parseFloat(wind).toLocaleString() + ' ' + wind_unit;
-        else // i.e. wind > 0 && wind_direction
-            this._currentWeatherWind.text = wind_direction + ' ' + parseFloat(wind).toLocaleString() + ' ' + wind_unit;
-
-        this.parseWeatherForecast();
-        this.recalcLayout();
-    },
+                speed = this.toBeaufort(speed);
+                unit = this.toBeaufort(speed, true);
+                break;
 
-    refreshWeatherCurrent: function() {
-        if (!this.extractId(this._city)) {
-            this.updateCities();
-            return;
         }
-        this.oldLocation = this.extractId(this._city);
-
-        let params = {
-            id: this.oldLocation,
-            units: 'metric'
-        };
-        if (this._appid)
-            params.APPID = this._appid;
-
-        this.load_json_async(WEATHER_URL_CURRENT, params, function(json) {
-            if (json && (Number(json.cod) == 200)) {
-
-                if (this.currentWeatherCache != json)
-                    this.currentWeatherCache = json;
 
-                this.rebuildSelectCityItem();
-
-                this.parseWeatherCurrent();
-            } else {
-                // we are connected, but get no (or no correct) data, so invalidate
-                // the shown data and reload after 10 minutes (recommendded by openweathermap.org)
-                this.rebuildCurrentWeatherUi();
-                this.reloadWeatherCurrent(600);
-            }
-        });
-        this.reloadWeatherCurrent(this._refresh_interval_current);
+        if (!speed)
+            return '\u2013';
+        else if (speed === 0 || !direction)
+            return parseFloat(speed).toLocaleString() + ' ' + unit;
+        else // i.e. speed > 0 && direction
+            return direction + ' ' + parseFloat(speed).toLocaleString() + ' ' + unit;
     },
 
     reloadWeatherCurrent: function(interval) {
         if (this._timeoutCurrent) {
             Mainloop.source_remove(this._timeoutCurrent);
+            this._timeoutCurrent = undefined;
         }
+        _timeCacheCurrentWeather = new Date();
         this._timeoutCurrent = Mainloop.timeout_add_seconds(interval, Lang.bind(this, function() {
-            this.currentWeatherCache = undefined;
-            if (this._connected)
-                this.parseWeatherCurrent();
-            else
-                this.rebuildCurrentWeatherUi();
+            // only invalidate cached data, if we can connect the weather-providers server
+            if (this._connected && !this._idle)
+                this.currentWeatherCache = undefined;
+            this.parseWeatherCurrent();
             return true;
         }));
     },
 
-    parseWeatherForecast: function() {
-        if (this.forecastWeatherCache === undefined) {
-            this.refreshWeatherForecast();
-            return;
-        }
-
-        let forecast = this.forecastWeatherCache;
-        let beginOfDay = new Date(new Date().setHours(0, 0, 0, 0));
-
-        // Refresh forecast
-        for (let i = 0; i < this._days_forecast; i++) {
-            let forecastUi = this._forecast[i];
-            let forecastData = forecast[i];
-            if (forecastData === undefined)
-                continue;
-
-            let t_low = forecastData.temp.min;
-            let t_high = forecastData.temp.max;
-
-            switch (this._units) {
-                case WeatherUnits.FAHRENHEIT:
-                    t_low = this.toFahrenheit(t_low);
-                    t_high = this.toFahrenheit(t_high);
-                    break;
-
-                case WeatherUnits.CELSIUS:
-                    t_low = t_low.toFixed(this._decimal_places);
-                    t_high = t_high.toFixed(this._decimal_places);
-                    break;
-
-                case WeatherUnits.KELVIN:
-                    t_low = this.toKelvin(t_low);
-                    t_high = this.toKelvin(t_high);
-                    break;
-
-                case WeatherUnits.RANKINE:
-                    t_low = this.toRankine(t_low);
-                    t_high = this.toRankine(t_high);
-                    break;
-
-                case WeatherUnits.REAUMUR:
-                    t_low = this.toReaumur(t_low);
-                    t_high = this.toReaumur(t_high);
-                    break;
-
-                case WeatherUnits.ROEMER:
-                    t_low = this.toRoemer(t_low);
-                    t_high = this.toRoemer(t_high);
-                    break;
-
-                case WeatherUnits.DELISLE:
-                    t_low = this.toDelisle(t_low);
-                    t_high = this.toDelisle(t_high);
-                    break;
-
-                case WeatherUnits.NEWTON:
-                    t_low = this.toNewton(t_low);
-                    t_high = this.toNewton(t_high);
-                    break;
-            }
-
-            let comment = forecastData.weather[0].description;
-            if (this._translate_condition)
-                comment = this.get_weather_condition(forecastData.weather[0].id);
-
-            let forecastDate = new Date(forecastData.dt * 1000);
-            let dayLeft = Math.floor((forecastDate.getTime() - beginOfDay.getTime()) / 86400000);
-
-            let date_string = _("Today");
-            if (dayLeft == 1)
-                date_string = _("Tomorrow");
-            else if (dayLeft > 1)
-                date_string = _("In %s days").replace("%s", dayLeft);
-            else if (dayLeft == -1)
-                date_string = _("Yesterday");
-            else if (dayLeft < -1)
-                date_string = _("%s days ago").replace("%s", -1 * dayLeft);
-
-            forecastUi.Day.text = date_string + ' (' + this.get_locale_day(forecastDate.getDay()) + ')\n' + forecastDate.toLocaleDateString();
-            forecastUi.Temperature.text = '\u2193 ' + parseFloat(t_low).toLocaleString() + ' ' + this.unit_to_unicode() + '    \u2191 ' + parseFloat(t_high).toLocaleString() + ' ' + this.unit_to_unicode();
-            forecastUi.Summary.text = comment;
-            forecastUi.Icon.icon_name = this.get_weather_icon_safely(forecastData.weather[0].id);
-        }
-    },
-
-    refreshWeatherForecast: function() {
-
-        if (!this.extractId(this._city)) {
-            this.updateCities();
-            return;
-        }
-
-        this.oldLocation = this.extractId(this._city);
-
-        let params = {
-            id: this.oldLocation,
-            units: 'metric',
-            cnt: '13'
-        };
-        if (this._appid)
-            params.APPID = this._appid;
-
-        this.load_json_async(WEATHER_URL_FORECAST, params, function(json) {
-            if (json && (Number(json.cod) == 200)) {
-                if (this.forecastWeatherCache != json.list)
-                    this.forecastWeatherCache = json.list;
-
-                this.parseWeatherForecast();
-            } else {
-                // we are connected, but get no (or no correct) data, so invalidate
-                // the shown data and reload after 10 minutes (recommendded by openweathermap.org)
-                this.rebuildFutureWeatherUi();
-                this.reloadWeatherForecast(600);
-            }
-        });
-        this.reloadWeatherForecast(this._refresh_interval_forecast);
-    },
-
     reloadWeatherForecast: function(interval) {
         if (this._timeoutForecast) {
             Mainloop.source_remove(this._timeoutForecast);
+            this._timeoutForecast = undefined;
         }
+        _timeCacheForecastWeather = new Date();
         this._timeoutForecast = Mainloop.timeout_add_seconds(interval, Lang.bind(this, function() {
-            this.forecastWeatherCache = undefined;
-            if (this._connected)
-                this.parseWeatherForecast();
-            else
-                this.rebuildFutureWeatherUi();
+            // only invalidate cached data, if we can connect the weather-providers server
+            if (this._connected && !this._idle)
+                this.forecastWeatherCache = undefined;
+            this.parseWeatherForecast();
             return true;
         }));
     },
@@ -1750,33 +1286,33 @@
     },
 
     rebuildCurrentWeatherUi: function() {
-        this._weatherInfo.text = _('Loading current weather ...');
-        this._weatherIcon.icon_name = 'view-refresh' + this.icon_type();
+        this._weatherInfo.text = (' ');
+        this._weatherIcon.icon_name = 'view-refresh' + this.getIconType();
 
         this.destroyCurrentWeather();
 
         // This will hold the icon for the current weather
         this._currentWeatherIcon = new St.Icon({
             icon_size: 72,
-            icon_name: 'view-refresh' + this.icon_type(),
-            style_class: 'openweather-current-icon'
+            icon_name: 'view-refresh' + this.getIconType(),
+            style_class: 'system-menu-action openweather-current-icon'
         });
 
         this._sunriseIcon = new St.Icon({
             icon_size: 15,
-            icon_name: 'weather-clear' + this.icon_type(),
+            icon_name: 'weather-clear' + this.getIconType(),
             style_class: 'openweather-sunrise-icon'
         });
 
         this._sunsetIcon = new St.Icon({
             icon_size: 15,
-            icon_name: 'weather-clear-night' + this.icon_type(),
+            icon_name: 'weather-clear-night' + this.getIconType(),
             style_class: 'openweather-sunset-icon'
         });
 
         this._buildIcon = new St.Icon({
             icon_size: 15,
-            icon_name: 'view-refresh' + this.icon_type(),
+            icon_name: 'view-refresh' + this.getIconType(),
             style_class: 'openweather-build-icon'
         });
 
@@ -1791,7 +1327,7 @@
 
         let bb = new St.BoxLayout({
             vertical: true,
-            style_class: 'openweather-current-summarybox'
+            style_class: 'system-menu-action openweather-current-summarybox'
         });
         bb.add_actor(this._currentWeatherLocation);
         bb.add_actor(this._currentWeatherSummary);
@@ -1819,7 +1355,7 @@
         bb.add_actor(ab);
 
         // Other labels
-        this._currentWeatherTemperature = new St.Label({
+        this._currentWeatherCloudiness = new St.Label({
             text: '...'
         });
         this._currentWeatherHumidity = new St.Label({
@@ -1837,11 +1373,11 @@
         });
         let rb_captions = new St.BoxLayout({
             vertical: true,
-            style_class: 'openweather-current-databox-captions'
+            style_class: 'popup-menu-item popup-status-menu-item openweather-current-databox-captions'
         });
         let rb_values = new St.BoxLayout({
             vertical: true,
-            style_class: 'openweather-current-databox-values'
+            style_class: 'system-menu-action openweather-current-databox-values'
         });
         rb.add_actor(rb_captions);
         rb.add_actor(rb_values);
@@ -1849,7 +1385,7 @@
         rb_captions.add_actor(new St.Label({
             text: _('Cloudiness:')
         }));
-        rb_values.add_actor(this._currentWeatherTemperature);
+        rb_values.add_actor(this._currentWeatherCloudiness);
         rb_captions.add_actor(new St.Label({
             text: _('Humidity:')
         }));
@@ -1881,7 +1417,7 @@
         this._forecastScrollBox.hscroll.adjustment.value += delta;
     },
 
-    rebuildFutureWeatherUi: function() {
+    rebuildFutureWeatherUi: function(cnt) {
         this.destroyFutureWeather();
 
         this._forecast = [];
@@ -1919,22 +1455,25 @@
 
         this._futureWeather.set_child(this._forecastScrollBox);
 
-        for (let i = 0; i < this._days_forecast; i++) {
+        if (cnt === undefined)
+            cnt = this._days_forecast;
+        for (let i = 0; i < cnt; i++) {
             let forecastWeather = {};
 
             forecastWeather.Icon = new St.Icon({
                 icon_size: 48,
-                icon_name: 'view-refresh' + this.icon_type(),
-                style_class: 'openweather-forecast-icon'
+                icon_name: 'view-refresh' + this.getIconType(),
+                style_class: 'system-menu-action openweather-forecast-icon'
             });
             forecastWeather.Day = new St.Label({
-                style_class: 'openweather-forecast-day'
+                style_class: 'popup-menu-item popup-status-menu-item openweather-forecast-day'
             });
             forecastWeather.Summary = new St.Label({
-                style_class: 'openweather-forecast-summary'
+                style_class: 'system-menu-action  openweather-forecast-summary'
             });
+            forecastWeather.Summary.clutter_text.line_wrap = true;
             forecastWeather.Temperature = new St.Label({
-                style_class: 'openweather-forecast-temperature'
+                style_class: 'system-menu-action  openweather-forecast-temperature'
             });
 
             let by = new St.BoxLayout({
@@ -1942,7 +1481,8 @@
                 style_class: 'openweather-forecast-databox'
             });
             by.add_actor(forecastWeather.Day);
-            by.add_actor(forecastWeather.Summary);
+            if (this._comment_in_forecast)
+                by.add_actor(forecastWeather.Summary);
             by.add_actor(forecastWeather.Temperature);
 
             let bb = new St.BoxLayout({
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/src/forecast_io.js gnome-shell-extension-weather-0~20151114.git609/src/forecast_io.js
--- gnome-shell-extension-weather-0~20140924.git7e28508/src/forecast_io.js	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/src/forecast_io.js	2015-11-17 15:10:32.000000000 +0000
@@ -0,0 +1,284 @@
+/* jshint esnext:true */
+/*
+ *
+ *  Weather extension for GNOME Shell
+ *  - Displays a small weather information on the top panel.
+ *  - On click, gives a popup with details about the weather.
+ *
+ * Copyright (C) 2011 - 2013
+ *     ecyrbe <ecyrbe+spam@gmail.com>,
+ *     Timur Kristof <venemo@msn.com>,
+ *     Elad Alfassa <elad@fedoraproject.org>,
+ *     Simon Legner <Simon.Legner@gmail.com>,
+ *     Christian METZLER <neroth@xeked.com>,
+ *     Mark Benjamin weather.gnome.Markie1@dfgh.net,
+ *     Mattia Meneguzzo odysseus@fedoraproject.org,
+ *     Meng Zhuo <mengzhuo1203+spam@gmail.com>,
+ *     Jens Lody <jens@jenslody.de>
+ * Copyright (C) 2014 -2015
+ *     Jens Lody <jens@jenslody.de>,
+ *
+ *
+ * This file is part of gnome-shell-extension-openweather.
+ *
+ * gnome-shell-extension-openweather is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * gnome-shell-extension-openweather is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gnome-shell-extension-openweather.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+const Gettext = imports.gettext.domain('gnome-shell-extension-openweather');
+const _ = Gettext.gettext;
+const ngettext = Gettext.ngettext;
+
+
+const OPENWEATHER_URL_HOST = 'api.forecast.io';
+const OPENWEATHER_URL_BASE = 'https://' + OPENWEATHER_URL_HOST + '/forecast/';
+
+function getWeatherIcon(icon) {
+    //    clear-day             weather-clear-day
+    //    clear-night           weather-clear-night
+    //    rain                  weather-showers
+    //    snow                  weather-snow
+    //    sleet                 weather-snow
+    //    wind                  weather-storm
+    //    fog                   weather-fog
+    //    cloudy                weather-overcast
+    //    partly-cloudy-day     weather-few-clouds
+    //    partly-cloudy-night   weather-few-clouds-night
+    let iconname = ['weather-severe-alert'];
+    switch (icon) {
+        case 'wind':
+            iconname = ['weather-storm'];
+            break;
+        case 'rain':
+            iconname = ['weather-showers-scattered', 'weather-showers'];
+            break;
+        case 'sleet':
+        case 'snow':
+            iconname = ['weather-snow'];
+            break;
+        case 'fog':
+            iconname = ['weather-fog'];
+            break;
+        case 'clear-day': //sky is clear
+            iconname = ['weather-clear'];
+            break;
+        case 'clear-night': //sky is clear
+            iconname = ['weather-clear-night'];
+            break;
+        case 'partly-cloudy-day':
+            iconname = ['weather-few-clouds'];
+            break;
+        case 'partly-cloudy-night':
+            iconname = ['weather-few-clouds-night'];
+            break;
+        case 'cloudy':
+            iconname = ['weather-overcast'];
+            break;
+    }
+    for (let i = 0; i < iconname.length; i++) {
+        if (this.hasIcon(iconname[i]))
+            return iconname[i] + this.getIconType();
+    }
+    return 'weather-severe-alert' + this.getIconType();
+}
+
+function parseWeatherCurrent() {
+    if (this.currentWeatherCache === undefined) {
+        // this is a reentrency guard, in this times set for both caches,
+        // because they get updated with one call to forecast.io
+        this.currentWeatherCache = "in refresh";
+        // but do it only if the cache has been cleared, otherwise we would
+        // overwrite possibly valid data, that can be kept if the update fails
+        // for some reason
+        if (this.forecastWeatherCache === undefined)
+            this.forecastWeatherCache = "in refresh";
+        this.refreshWeatherCurrent();
+        return;
+    }
+
+    if ((this.forecastWeatherCache == "in refresh") ||
+        (this.currentWeatherCache == "in refresh"))
+        return;
+
+    this.checkPositionInPanel();
+
+    let json = this.currentWeatherCache;
+
+    this.owmCityId = 0;
+    // Refresh current weather
+    let location = this.extractLocation(this._city);
+
+    let comment = json.summary;
+
+    let temperature = this.formatTemperature(json.temperature);
+
+    let now = new Date();
+
+    let iconname = this.getWeatherIcon(json.icon);
+
+    if (this.lastBuildId === undefined)
+        this.lastBuildId = 0;
+
+    if (this.lastBuildDate === undefined)
+        this.lastBuildDate = 0;
+
+    if (this.lastBuildId != json.time || !this.lastBuildDate) {
+        this.lastBuildId = json.time;
+        this.lastBuildDate = new Date(this.lastBuildId * 1000);
+    }
+
+    let lastBuild = '-';
+
+    if (this._clockFormat == "24h")
+        lastBuild = this.lastBuildDate.toLocaleFormat("%R");
+    else
+        lastBuild = this.lastBuildDate.toLocaleFormat("%I:%M %p");
+
+    let beginOfDay = new Date(new Date().setHours(0, 0, 0, 0));
+    let d = Math.floor((this.lastBuildDate.getTime() - beginOfDay.getTime()) / 86400000);
+    if (d < 0) {
+        lastBuild = _("Yesterday");
+        if (d < -1) {
+            d *= -1;
+            lastBuild = ngettext("%d day ago", "%d days ago", d).format(d);
+        }
+    }
+
+    this._currentWeatherIcon.icon_name = this._weatherIcon.icon_name = iconname;
+
+    let weatherInfoC = "";
+    let weatherInfoT = "";
+    if (this._comment_in_panel)
+        weatherInfoC = comment;
+
+    if (this._text_in_panel)
+        weatherInfoT = temperature;
+
+    this._weatherInfo.text = weatherInfoC + ((weatherInfoC && weatherInfoT) ? ", " : "") + weatherInfoT;
+
+    this._currentWeatherSummary.text = comment + ", " + temperature;
+    this._currentWeatherLocation.text = location;
+    this._currentWeatherCloudiness.text = parseInt(json.cloudCover * 100) + ' %';
+    this._currentWeatherHumidity.text = parseInt(json.humidity * 100) + ' %';
+    this._currentWeatherPressure.text = this.formatPressure(json.pressure);
+
+    this._currentWeatherBuild.text = lastBuild;
+
+    this._currentWeatherWind.text = this.formatWind(json.windSpeed, this.getWindDirection(json.windBearing));
+
+    this.parseWeatherForecast();
+    this.recalcLayout();
+}
+
+function refreshWeatherCurrent() {
+    this.oldLocation = this.extractCoord(this._city);
+
+    let params = {
+        exclude: 'minutely,hourly,alerts,flags',
+        lang: this.fc_locale,
+        units: 'si'
+    };
+    let url = OPENWEATHER_URL_BASE + this._appid_fc + '/' + this.oldLocation;
+    this.load_json_async(url, params, function(json) {
+        if (json && json.currently) {
+
+            if (this.currentWeatherCache != json.currently)
+                this.currentWeatherCache = json.currently;
+
+            if (json.daily && json.daily.data) {
+                if (this.forecastWeatherCache != json.daily.data)
+                    this.forecastWeatherCache = json.daily.data;
+            }
+
+            this.rebuildSelectCityItem();
+
+            this.parseWeatherCurrent();
+        } else {
+            this.reloadWeatherCurrent(600);
+        }
+    });
+    this.reloadWeatherCurrent(this._refresh_interval_current);
+}
+
+function parseWeatherForecast() {
+    if ((this.forecastWeatherCache == "in refresh") ||
+        (this.currentWeatherCache == "in refresh"))
+        return;
+
+    if (this.forecastWeatherCache === undefined) {
+        // this is a reentrency guard, in this times set for both caches,
+        // because they get updated with one call to forecast.io
+        this.forecastWeatherCache = "in refresh";
+        // but do it only if the cache has been cleared, otherwise we would
+        // overwrite possibly valid data, that can be kept if the update fails
+        // for some reason
+        if (this.currentWeatherCache === undefined)
+            this.currentWeatherCache = "in refresh";
+        this.refreshWeatherCurrent();
+        return;
+    }
+
+    let forecast = this.forecastWeatherCache;
+    let beginOfDay = new Date(new Date().setHours(0, 0, 0, 0));
+    let cnt = Math.min(this._days_forecast, forecast.length);
+    if (cnt != this._days_forecast)
+        this.rebuildFutureWeatherUi(cnt);
+
+    // Refresh forecast
+    for (let i = 0; i < cnt; i++) {
+        let forecastUi = this._forecast[i];
+        let forecastData = forecast[i];
+        if (forecastData === undefined)
+            continue;
+
+        let t_low = this.formatTemperature(forecastData.temperatureMin);
+        let t_high = this.formatTemperature(forecastData.temperatureMax);
+
+
+        let comment = forecastData.summary;
+        let forecastDate = new Date(forecastData.time * 1000);
+        let dayLeft = Math.floor((forecastDate.getTime() - beginOfDay.getTime()) / 86400000);
+
+        let date_string = _("Today");
+
+        let sunrise = new Date(forecastData.sunriseTime * 1000);
+        let sunset = new Date(forecastData.sunsetTime * 1000);
+
+        if (dayLeft === 0) {
+            if (this._clockFormat == "24h") {
+                sunrise = sunrise.toLocaleFormat("%R");
+                sunset = sunset.toLocaleFormat("%R");
+            } else {
+                sunrise = sunrise.toLocaleFormat("%I:%M %p");
+                sunset = sunset.toLocaleFormat("%I:%M %p");
+            }
+            this._currentWeatherSunrise.text = sunrise;
+            this._currentWeatherSunset.text = sunset;
+        } else if (dayLeft == 1)
+            date_string = _("Tomorrow");
+        else if (dayLeft > 1)
+            date_string = ngettext("In %d day", "In %d days", dayLeft).format(dayLeft);
+        else if (dayLeft == -1)
+            date_string = _("Yesterday");
+        else if (dayLeft < -1) {
+            dayLeft *= -1;
+            date_string = ngettext("%d day ago", "%d days ago", dayLeft).format(dayLeft);
+        }
+
+        forecastUi.Day.text = date_string + ' (' + this.getLocaleDay(forecastDate.getDay()) + ')\n' + forecastDate.toLocaleDateString();
+        forecastUi.Temperature.text = '\u2193 ' + t_low + '    \u2191 ' + t_high;
+        forecastUi.Summary.text = comment;
+        forecastUi.Icon.icon_name = this.getWeatherIcon(forecastData.icon);
+    }
+}
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/src/Makefile.am gnome-shell-extension-weather-0~20151114.git609/src/Makefile.am
--- gnome-shell-extension-weather-0~20140924.git7e28508/src/Makefile.am	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/src/Makefile.am	2015-11-17 15:10:32.000000000 +0000
@@ -5,6 +5,6 @@
 
 extensiondir = $(topextensiondir)/$(uuid)
 
-dist_extension_DATA = extension.js convenience.js prefs.js
+dist_extension_DATA = extension.js forecast_io.js openweathermap_org.js convenience.js prefs.js
 
 nodist_extension_DATA = $(EXTRA_EXTENSION)
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/src/openweathermap_org.js gnome-shell-extension-weather-0~20151114.git609/src/openweathermap_org.js
--- gnome-shell-extension-weather-0~20140924.git7e28508/src/openweathermap_org.js	1970-01-01 00:00:00.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/src/openweathermap_org.js	2015-11-17 15:10:32.000000000 +0000
@@ -0,0 +1,495 @@
+/* jshint esnext:true */
+/*
+ *
+ *  Weather extension for GNOME Shell
+ *  - Displays a small weather information on the top panel.
+ *  - On click, gives a popup with details about the weather.
+ *
+ * Copyright (C) 2011 - 2013
+ *     ecyrbe <ecyrbe+spam@gmail.com>,
+ *     Timur Kristof <venemo@msn.com>,
+ *     Elad Alfassa <elad@fedoraproject.org>,
+ *     Simon Legner <Simon.Legner@gmail.com>,
+ *     Christian METZLER <neroth@xeked.com>,
+ *     Mark Benjamin weather.gnome.Markie1@dfgh.net,
+ *     Mattia Meneguzzo odysseus@fedoraproject.org,
+ *     Meng Zhuo <mengzhuo1203+spam@gmail.com>,
+ *     Jens Lody <jens@jenslody.de>
+ * Copyright (C) 2014 -2015
+ *     Jens Lody <jens@jenslody.de>,
+ *
+ *
+ * This file is part of gnome-shell-extension-openweather.
+ *
+ * gnome-shell-extension-openweather is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * gnome-shell-extension-openweather is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gnome-shell-extension-openweather.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const OpenweathermapOrg = Me.imports.openweathermap_org;
+const Gettext = imports.gettext.domain('gnome-shell-extension-openweather');
+const _ = Gettext.gettext;
+const ngettext = Gettext.ngettext;
+
+const OPENWEATHER_URL_HOST = 'api.openweathermap.org';
+const OPENWEATHER_URL_BASE = 'http://' + OPENWEATHER_URL_HOST + '/data/2.5/';
+const OPENWEATHER_URL_CURRENT = OPENWEATHER_URL_BASE + 'weather';
+const OPENWEATHER_URL_FORECAST = OPENWEATHER_URL_BASE + 'forecast/daily';
+
+function getWeatherIcon(code, night) {
+
+    let iconname = ['weather-severe-alert'];
+    // see http://bugs.openweathermap.org/projects/api/wiki/Weather_Condition_Codes
+    // fallback icons are: weather-clear-night weather-clear weather-few-clouds-night weather-few-clouds weather-fog weather-overcast weather-severe-alert weather-showers weather-showers-scattered weather-snow weather-storm
+    /*
+weather-clouds-night.png
+weather-freezing-rain.png
+weather-hail.png
+weather-many-clouds.png
+weather-showers-day.png
+weather-showers-night.png
+weather-showers-scattered-day.png
+weather-showers-scattered-night.png
+weather-snow-rain.png
+weather-snow-scattered-day.png
+weather-snow-scattered-night.png
+weather-snow-scattered.png
+weather-storm-day.png
+weather-storm-night.png
+
+weather-severe-alert-symbolic.svg
+
+
+weather-clear-night.png = weather-clear-night-symbolic.svg
+weather-clear.png = weather-clear-symbolic.svg
+weather-clouds.png = weather-overcast-symbolic.svg
+weather-few-clouds-night.png = weather-few-clouds-night-symbolic.svg
+weather-few-clouds.png = weather-few-clouds-symbolic.svg
+weather-mist.png = weather-fog-symbolic.svg
+weather-showers-scattered.png = weather-showers-scattered-symbolic.svg
+weather-showers.png = weather-showers-symbolic.svg
+weather-snow.png = weather-snow-symbolic.svg
+weather-storm.png = weather-storm-symbolic.svg
+
+*/
+    switch (parseInt(code, 10)) {
+        case 200: //thunderstorm with light rain
+        case 201: //thunderstorm with rain
+        case 202: //thunderstorm with heavy rain
+        case 210: //light thunderstorm
+        case 211: //thunderstorm
+        case 212: //heavy thunderstorm
+        case 221: //ragged thunderstorm
+        case 230: //thunderstorm with light drizzle
+        case 231: //thunderstorm with drizzle
+        case 232: //thunderstorm with heavy drizzle
+            iconname = ['weather-storm'];
+            break;
+        case 300: //light intensity drizzle
+        case 301: //drizzle
+        case 302: //heavy intensity drizzle
+        case 310: //light intensity drizzle rain
+        case 311: //drizzle rain
+        case 312: //heavy intensity drizzle rain
+        case 313: //shower rain and drizzle
+        case 314: //heavy shower rain and drizzle
+        case 321: //shower drizzle
+            iconname = ['weather-showers'];
+            break;
+        case 500: //light rain
+        case 501: //moderate rain
+        case 502: //heavy intensity rain
+        case 503: //very heavy rain
+        case 504: //extreme rain
+            iconname = ['weather-showers-scattered', 'weather-showers'];
+            break;
+        case 511: //freezing rain
+            iconname = ['weather-freezing-rain', 'weather-showers'];
+            break;
+        case 520: //light intensity shower rain
+        case 521: //shower rain
+        case 522: //heavy intensity shower rain
+        case 531: //ragged shower rain
+            iconname = ['weather-showers'];
+            break;
+        case 600: //light snow
+        case 601: //snow
+        case 602: //heavy snow
+        case 611: //sleet
+        case 612: //shower sleet
+        case 615: //light rain and snow
+        case 616: //rain and snow
+        case 620: //light shower snow
+        case 621: //shower snow
+        case 622: //heavy shower snow
+            iconname = ['weather-snow'];
+            break;
+        case 701: //mist
+        case 711: //smoke
+        case 721: //haze
+        case 741: //Fog
+            iconname = ['weather-fog'];
+            break;
+        case 731: //Sand/Dust Whirls
+        case 751: //sand
+        case 761: //dust
+        case 762: //VOLCANIC ASH
+        case 771: //SQUALLS
+        case 781: //TORNADO
+            iconname = ['weather-severe-alert'];
+            break;
+        case 800: //sky is clear
+            iconname = ['weather-clear'];
+            break;
+        case 801: //few clouds
+        case 802: //scattered clouds
+            iconname = ['weather-few-clouds'];
+            break;
+        case 803: //broken clouds
+            iconname = ['weather-many-clouds', 'weather-overcast'];
+            break;
+        case 804: //overcast clouds
+            iconname = ['weather-overcast'];
+            break;
+    }
+
+    for (let i = 0; i < iconname.length; i++) {
+        if (night && this.hasIcon(iconname[i] + '-night'))
+            return iconname[i] + '-night' + this.getIconType();
+        if (this.hasIcon(iconname[i]))
+            return iconname[i] + this.getIconType();
+    }
+    return 'weather-severe-alert' + this.getIconType();
+}
+
+function getWeatherCondition(code) {
+    switch (parseInt(code, 10)) {
+        case 200: //thunderstorm with light rain
+            return _('thunderstorm with light rain');
+        case 201: //thunderstorm with rain
+            return _('thunderstorm with rain');
+        case 202: //thunderstorm with heavy rain
+            return _('thunderstorm with heavy rain');
+        case 210: //light thunderstorm
+            return _('light thunderstorm');
+        case 211: //thunderstorm
+            return _('thunderstorm');
+        case 212: //heavy thunderstorm
+            return _('heavy thunderstorm');
+        case 221: //ragged thunderstorm
+            return _('ragged thunderstorm');
+        case 230: //thunderstorm with light drizzle
+            return _('thunderstorm with light drizzle');
+        case 231: //thunderstorm with drizzle
+            return _('thunderstorm with drizzle');
+        case 232: //thunderstorm with heavy drizzle
+            return _('thunderstorm with heavy drizzle');
+        case 300: //light intensity drizzle
+            return _('light intensity drizzle');
+        case 301: //drizzle
+            return _('drizzle');
+        case 302: //heavy intensity drizzle
+            return _('heavy intensity drizzle');
+        case 310: //light intensity drizzle rain
+            return _('light intensity drizzle rain');
+        case 311: //drizzle rain
+            return _('drizzle rain');
+        case 312: //heavy intensity drizzle rain
+            return _('heavy intensity drizzle rain');
+        case 313: //shower rain and drizzle
+            return _('shower rain and drizzle');
+        case 314: //heavy shower rain and drizzle
+            return _('heavy shower rain and drizzle');
+        case 321: //shower drizzle
+            return _('shower drizzle');
+        case 500: //light rain
+            return _('light rain');
+        case 501: //moderate rain
+            return _('moderate rain');
+        case 502: //heavy intensity rain
+            return _('heavy intensity rain');
+        case 503: //very heavy rain
+            return _('very heavy rain');
+        case 504: //extreme rain
+            return _('extreme rain');
+        case 511: //freezing rain
+            return _('freezing rain');
+        case 520: //light intensity shower rain
+            return _('light intensity shower rain');
+        case 521: //shower rain
+            return _('shower rain');
+        case 522: //heavy intensity shower rain
+            return _('heavy intensity shower rain');
+        case 531: //ragged shower rain
+            return _('ragged shower rain');
+        case 600: //light snow
+            return _('light snow');
+        case 601: //snow
+            return _('snow');
+        case 602: //heavy snow
+            return _('heavy snow');
+        case 611: //sleet
+            return _('sleet');
+        case 612: //shower sleet
+            return _('shower sleet');
+        case 615: //light rain and snow
+            return _('light rain and snow');
+        case 616: //rain and snow
+            return _('rain and snow');
+        case 620: //light shower snow
+            return _('light shower snow');
+        case 621: //shower snow
+            return _('shower snow');
+        case 622: //heavy shower snow
+            return _('heavy shower snow');
+        case 701: //mist
+            return _('mist');
+        case 711: //smoke
+            return _('smoke');
+        case 721: //haze
+            return _('haze');
+        case 731: //Sand/Dust Whirls
+            return _('Sand/Dust Whirls');
+        case 741: //Fog
+            return _('Fog');
+        case 751: //sand
+            return _('sand');
+        case 761: //dust
+            return _('dust');
+        case 762: //VOLCANIC ASH
+            return _('VOLCANIC ASH');
+        case 771: //SQUALLS
+            return _('SQUALLS');
+        case 781: //TORNADO
+            return _('TORNADO');
+        case 800: //sky is clear
+            return _('sky is clear');
+        case 801: //few clouds
+            return _('few clouds');
+        case 802: //scattered clouds
+            return _('scattered clouds');
+        case 803: //broken clouds
+            return _('broken clouds');
+        case 804: //overcast clouds
+            return _('overcast clouds');
+        default:
+            return _('Not available');
+    }
+}
+
+function parseWeatherCurrent() {
+    if (this.currentWeatherCache === undefined) {
+        // this is a reentrency guard
+        this.currentWeatherCache = "in refresh";
+        this.refreshWeatherCurrent();
+        return;
+    }
+
+    if (this.currentWeatherCache == "in refresh")
+        return;
+
+    this.checkPositionInPanel();
+
+    let json = this.currentWeatherCache;
+
+    this.owmCityId = json.id;
+    // Refresh current weather
+    let location = this.extractLocation(this._city);
+
+    let comment = json.weather[0].description;
+    if (this._translate_condition)
+        comment = OpenweathermapOrg.getWeatherCondition(json.weather[0].id);
+
+    let temperature = this.formatTemperature(json.main.temp);
+    let sunrise = new Date(json.sys.sunrise * 1000);
+    let sunset = new Date(json.sys.sunset * 1000);
+    let now = new Date();
+
+    let iconname = this.getWeatherIcon(json.weather[0].id, now < sunrise || now > sunset);
+
+    if (this.lastBuildId === undefined)
+        this.lastBuildId = 0;
+
+    if (this.lastBuildDate === undefined)
+        this.lastBuildDate = 0;
+
+    if (this.lastBuildId != json.dt || !this.lastBuildDate) {
+        this.lastBuildId = json.dt;
+        this.lastBuildDate = new Date(this.lastBuildId * 1000);
+    }
+
+    let lastBuild = '-';
+
+    if (this._clockFormat == "24h") {
+        sunrise = sunrise.toLocaleFormat("%R");
+        sunset = sunset.toLocaleFormat("%R");
+        lastBuild = this.lastBuildDate.toLocaleFormat("%R");
+    } else {
+        sunrise = sunrise.toLocaleFormat("%I:%M %p");
+        sunset = sunset.toLocaleFormat("%I:%M %p");
+        lastBuild = this.lastBuildDate.toLocaleFormat("%I:%M %p");
+    }
+
+    let beginOfDay = new Date(new Date().setHours(0, 0, 0, 0));
+    let d = Math.floor((this.lastBuildDate.getTime() - beginOfDay.getTime()) / 86400000);
+    if (d < 0) {
+        lastBuild = _("Yesterday");
+        if (d < -1)
+            lastBuild = ngettext("%d day ago", "%d days ago", -1 * d).format(-1 * d);
+    }
+
+    this._currentWeatherIcon.icon_name = this._weatherIcon.icon_name = iconname;
+
+    let weatherInfoC = "";
+    let weatherInfoT = "";
+
+    if (this._comment_in_panel)
+        weatherInfoC = comment;
+
+    if (this._text_in_panel)
+        weatherInfoT = temperature;
+
+    this._weatherInfo.text = weatherInfoC + ((weatherInfoC && weatherInfoT) ? ", " : "") + weatherInfoT;
+
+    this._currentWeatherSummary.text = comment + ", " + temperature;
+    this._currentWeatherLocation.text = location;
+    this._currentWeatherCloudiness.text = json.clouds.all + ' %';
+    this._currentWeatherHumidity.text = json.main.humidity + ' %';
+    this._currentWeatherPressure.text = this.formatPressure(json.main.pressure);
+    this._currentWeatherSunrise.text = sunrise;
+    this._currentWeatherSunset.text = sunset;
+    this._currentWeatherBuild.text = lastBuild;
+    this._currentWeatherWind.text = this.formatWind(json.wind.speed, this.getWindDirection(json.wind.deg));
+
+    this.parseWeatherForecast();
+    this.recalcLayout();
+}
+
+function refreshWeatherCurrent() {
+    this.oldLocation = this.extractCoord(this._city);
+
+    if (this.oldLocation.search(",") == -1)
+        return;
+
+    let params = {
+        lat: this.oldLocation.split(",")[0],
+        lon: this.oldLocation.split(",")[1],
+        units: 'metric'
+    };
+    if (this._appid)
+        params.APPID = this._appid;
+
+    this.load_json_async(OPENWEATHER_URL_CURRENT, params, function(json) {
+        if (json && (Number(json.cod) == 200)) {
+
+            if (this.currentWeatherCache != json)
+                this.currentWeatherCache = json;
+
+            this.rebuildSelectCityItem();
+
+            this.parseWeatherCurrent();
+        } else {
+            // we are connected, but get no (or no correct) data, so invalidate
+            // the shown data and reload after 10 minutes (recommendded by openweathermap.org)
+            this.rebuildCurrentWeatherUi();
+            this.reloadWeatherCurrent(600);
+        }
+    });
+    this.reloadWeatherCurrent(this._refresh_interval_current);
+}
+
+function parseWeatherForecast() {
+    if (this.forecastWeatherCache === undefined) {
+        // this is a reentrency guard
+        this.forecastWeatherCache = "in refresh";
+        this.refreshWeatherForecast();
+        return;
+    }
+
+    if (this.forecastWeatherCache == "in refresh")
+        return;
+
+    let forecast = this.forecastWeatherCache;
+    let beginOfDay = new Date(new Date().setHours(0, 0, 0, 0));
+
+    // Refresh forecast
+    for (let i = 0; i < this._days_forecast; i++) {
+        let forecastUi = this._forecast[i];
+        let forecastData = forecast[i];
+        if (forecastData === undefined)
+            continue;
+
+        let t_low = this.formatTemperature(forecastData.temp.min);
+        let t_high = this.formatTemperature(forecastData.temp.max);
+
+        let comment = forecastData.weather[0].description;
+        if (this._translate_condition)
+            comment = OpenweathermapOrg.getWeatherCondition(forecastData.weather[0].id);
+
+        let forecastDate = new Date(forecastData.dt * 1000);
+        let dayLeft = Math.floor((forecastDate.getTime() - beginOfDay.getTime()) / 86400000);
+
+        let date_string = _("Today");
+        if (dayLeft == 1)
+            date_string = _("Tomorrow");
+        else if (dayLeft > 1)
+            date_string = ngettext("In %d day", "In %d days", dayLeft).format(dayLeft);
+        else if (dayLeft == -1)
+            date_string = _("Yesterday");
+        else if (dayLeft < -1)
+            date_string = ngettext("%d day ago", "%d days ago", -1 * dayLeft).format(-1 * dayLeft);
+
+        forecastUi.Day.text = date_string + ' (' + this.getLocaleDay(forecastDate.getDay()) + ')\n' + forecastDate.toLocaleDateString();
+        forecastUi.Temperature.text = '\u2193 ' + t_low + '    \u2191 ' + t_high;
+        forecastUi.Summary.text = comment;
+        forecastUi.Icon.icon_name = this.getWeatherIcon(forecastData.weather[0].id);
+    }
+}
+
+function refreshWeatherForecast() {
+
+
+    this.oldLocation = this.extractCoord(this._city);
+
+    if (this.oldLocation.search(",") == -1)
+        return;
+
+    let params = {
+        lat: this.oldLocation.split(",")[0],
+        lon: this.oldLocation.split(",")[1],
+        units: 'metric',
+        cnt: '13'
+    };
+    if (this._appid)
+        params.APPID = this._appid;
+
+    this.load_json_async(OPENWEATHER_URL_FORECAST, params, function(json) {
+        if (json && (Number(json.cod) == 200)) {
+            if (this.forecastWeatherCache != json.list) {
+                this.owmCityId = json.city.id;
+                this.forecastWeatherCache = json.list;
+            }
+
+            this.parseWeatherForecast();
+        } else {
+            // we are connected, but get no (or no correct) data, so invalidate
+            // the shown data and reload after 10 minutes (recommendded by openweathermap.org)
+            this.rebuildFutureWeatherUi();
+            this.reloadWeatherForecast(600);
+        }
+    });
+    this.reloadWeatherForecast(this._refresh_interval_forecast);
+}
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/src/prefs.js gnome-shell-extension-weather-0~20151114.git609/src/prefs.js
--- gnome-shell-extension-weather-0~20140924.git7e28508/src/prefs.js	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/src/prefs.js	2015-11-17 15:10:32.000000000 +0000
@@ -4,10 +4,12 @@
  *  Weather extension for GNOME Shell preferences
  *  - Creates a widget to set the preferences of the weather extension
  *
- * Copyright (C) 2012 - 2014
+ * Copyright (C) 2012 - 2013
  *     Canek Peláez <canek@ciencias.unam.mx>,
  *     Christian METZLER <neroth@xeked.com>,
  *     Jens Lody <jens@jenslody.de>,
+ * Copyright (C) 2014 -2015
+ *     Jens Lody <jens@jenslody.de>,
  *
  * This file is part of gnome-shell-extension-openweather.
  *
@@ -28,15 +30,13 @@
  *
  */
 const Gtk = imports.gi.Gtk;
-const Gdk = imports.gi.Gdk;
 const GObject = imports.gi.GObject;
-const GtkBuilder = Gtk.Builder;
-const Gio = imports.gi.Gio;
 const Gettext = imports.gettext.domain('gnome-shell-extension-openweather');
 const _ = Gettext.gettext;
 const Soup = imports.gi.Soup;
 
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Config = imports.misc.config;
@@ -44,35 +44,61 @@
 
 const EXTENSIONDIR = Me.dir.get_path();
 
-const WEATHER_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.openweather';
-const WEATHER_UNIT_KEY = 'unit';
-const WEATHER_PRESSURE_UNIT_KEY = 'pressure-unit';
-const WEATHER_WIND_SPEED_UNIT_KEY = 'wind-speed-unit';
-const WEATHER_WIND_DIRECTION_KEY = 'wind-direction';
-const WEATHER_CITY_KEY = 'city';
-const WEATHER_ACTUAL_CITY_KEY = 'actual-city';
-const WEATHER_TRANSLATE_CONDITION_KEY = 'translate-condition';
-const WEATHER_USE_SYMBOLIC_ICONS_KEY = 'use-symbolic-icons';
-const WEATHER_USE_TEXT_ON_BUTTONS_KEY = 'use-text-on-buttons';
-const WEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel';
-const WEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel';
-const WEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel';
-const WEATHER_REFRESH_INTERVAL_CURRENT = 'refresh-interval-current';
-const WEATHER_REFRESH_INTERVAL_FORECAST = 'refresh-interval-forecast';
-const WEATHER_CENTER_FORECAST_KEY = 'center-forecast';
-const WEATHER_DAYS_FORECAST = 'days-forecast';
-const WEATHER_DECIMAL_PLACES = 'decimal-places';
-const WEATHER_OWM_API_KEY = 'appid';
+const OPENWEATHER_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.openweather';
+const OPENWEATHER_PROVIDER_KEY = 'weather-provider';
+const OPENWEATHER_GEOLOCATION_PROVIDER_KEY = 'geolocation-provider';
+const OPENWEATHER_UNIT_KEY = 'unit';
+const OPENWEATHER_PRESSURE_UNIT_KEY = 'pressure-unit';
+const OPENWEATHER_WIND_SPEED_UNIT_KEY = 'wind-speed-unit';
+const OPENWEATHER_WIND_DIRECTION_KEY = 'wind-direction';
+const OPENWEATHER_CITY_KEY = 'city';
+const OPENWEATHER_ACTUAL_CITY_KEY = 'actual-city';
+const OPENWEATHER_TRANSLATE_CONDITION_KEY = 'translate-condition';
+const OPENWEATHER_USE_SYMBOLIC_ICONS_KEY = 'use-symbolic-icons';
+const OPENWEATHER_USE_TEXT_ON_BUTTONS_KEY = 'use-text-on-buttons';
+const OPENWEATHER_SHOW_TEXT_IN_PANEL_KEY = 'show-text-in-panel';
+const OPENWEATHER_POSITION_IN_PANEL_KEY = 'position-in-panel';
+const OPENWEATHER_SHOW_COMMENT_IN_PANEL_KEY = 'show-comment-in-panel';
+const OPENWEATHER_SHOW_COMMENT_IN_FORECAST_KEY = 'show-comment-in-forecast';
+const OPENWEATHER_REFRESH_INTERVAL_CURRENT = 'refresh-interval-current';
+const OPENWEATHER_REFRESH_INTERVAL_FORECAST = 'refresh-interval-forecast';
+const OPENWEATHER_CENTER_FORECAST_KEY = 'center-forecast';
+const OPENWEATHER_DAYS_FORECAST = 'days-forecast';
+const OPENWEATHER_DECIMAL_PLACES = 'decimal-places';
+const OPENWEATHER_USE_DEFAULT_OWM_API_KEY = 'use-default-owm-key';
+const OPENWEATHER_OWM_API_KEY = 'appid';
+const OPENWEATHER_FC_API_KEY = 'appid-fc';
+const OPENWEATHER_GC_APP_KEY = 'geolocation-appid-mapquest';
 
 //URL
-const WEATHER_URL_BASE = 'http://api.openweathermap.org/data/2.5/';
-const WEATHER_URL_CURRENT = WEATHER_URL_BASE + 'weather';
-const WEATHER_URL_FIND = WEATHER_URL_BASE + 'find';
+const OPENWEATHER_URL_MAPQUEST_BASE = 'https://open.mapquestapi.com/nominatim/v1/';
+const OPENWEATHER_URL_MAPQUEST_FIND = OPENWEATHER_URL_MAPQUEST_BASE + 'search.php';
+const OPENWEATHER_URL_GEOCODE_BASE = 'https://www.geocode.farm/v3/';
+const OPENWEATHER_URL_GEOCODE_FIND = OPENWEATHER_URL_GEOCODE_BASE + 'json/forward';
+const OPENWEATHER_URL_OSM_BASE = 'https://nominatim.openstreetmap.org/';
+const OPENWEATHER_URL_OSM_FIND = OPENWEATHER_URL_OSM_BASE + 'search';
+
+// Keep enums in sync with GSettings schemas
+const WeatherProvider = {
+    DEFAULT: -1,
+    OPENWEATHERMAP: 0,
+    FORECAST_IO: 1
+};
+
+const GeolocationProvider = {
+    OPENSTREETMAPS: 0,
+    GEOCODE: 1,
+    MAPQUEST: 2
+};
 
 let _httpSession;
 
 let mCities = null;
 
+let inRealize = false;
+
+let defaultSize = [-1, -1];
+
 const WeatherPrefsWidget = new GObject.Class({
     Name: 'OpenWeatherExtension.Prefs.Widget',
     GTypeName: 'OpenWeatherExtensionPrefsWidget',
@@ -81,11 +107,37 @@
     _init: function(params) {
         this.parent(params);
 
+        // Create user-agent string from uuid and (if present) the version
+        this.user_agent = Me.metadata.uuid;
+        if (Me.metadata.version !== undefined && Me.metadata.version.toString().trim() !== '') {
+            this.user_agent += '/';
+            this.user_agent += Me.metadata.version.toString();
+        }
+        // add trailing space, so libsoup adds its own user-agent
+        this.user_agent += ' ';
+
         this.initWindow();
 
+        defaultSize = this.MainWidget.get_size_request();
+        var borderWidth = this.MainWidget.get_border_width();
+
+        defaultSize[0] += 2 * borderWidth;
+        defaultSize[1] += 2 * borderWidth;
+
+        this.MainWidget.set_size_request(-1, -1);
+        this.MainWidget.set_border_width(0);
+
         this.refreshUI();
 
         this.add(this.MainWidget);
+        this.MainWidget.connect('realize', Lang.bind(this, function() {
+            if (inRealize)
+                return;
+            inRealize = true;
+
+            this.MainWidget.get_toplevel().resize(defaultSize[0], defaultSize[1]);
+            inRealize = false;
+        }));
     },
 
     Window: new Gtk.Builder(),
@@ -97,24 +149,248 @@
 
         this.MainWidget = this.Window.get_object("main-widget");
         this.treeview = this.Window.get_object("tree-treeview");
-        this.liststore = this.Window.get_object("liststore");
-        this.Iter = this.liststore.get_iter_first();
+        this.liststore = this.Window.get_object("tree-liststore");
+        this.editWidget = this.Window.get_object("edit-widget");
+        this.editName = this.Window.get_object("edit-name");
+        this.editCoord = this.Window.get_object("edit-coord");
+        this.editCombo = this.Window.get_object("edit-combo");
+        this.searchWidget = this.Window.get_object("search-widget");
+        this.searchMenu = this.Window.get_object("search-menu");
+        this.searchName = this.Window.get_object("search-name");
+        this.searchCombo = this.Window.get_object("search-combo");
+        this.spinner = this.Window.get_object("spinner");
+
+        this.searchName.connect("icon-release", Lang.bind(this, this.clearEntry));
+        this.editName.connect("icon-release", Lang.bind(this, this.clearEntry));
+        this.editCoord.connect("icon-release", Lang.bind(this, this.clearEntry));
 
         this.Window.get_object("tree-toolbutton-add").connect("clicked", Lang.bind(this, function() {
-            this.addCity();
+            this.searchWidget.show_all();
         }));
 
-        this.Window.get_object("tree-toolbutton-remove").connect("clicked", Lang.bind(this, function() {
-            this.removeCity();
-        }));
+        this.Window.get_object("tree-toolbutton-remove").connect("clicked", Lang.bind(this, this.removeCity));
+
+        this.Window.get_object("tree-toolbutton-edit").connect("clicked", Lang.bind(this, this.editCity));
 
         this.Window.get_object("treeview-selection").connect("changed", Lang.bind(this, function(selection) {
             this.selectionChanged(selection);
         }));
 
-        this.treeview.set_model(this.liststore);
+        this.Window.get_object("button-edit-cancel").connect("clicked", Lang.bind(this, this.editCancel));
+
+        this.Window.get_object("button-edit-save").connect("clicked", Lang.bind(this, this.editSave));
+
+        this.Window.get_object("button-search-cancel").connect("clicked", Lang.bind(this, function() {
+            this.searchWidget.hide();
+        }));
+
+        this.Window.get_object("button-search-save").connect("clicked", Lang.bind(this, this.searchSave));
+
+        this.Window.get_object("button-search-find").connect("clicked", Lang.bind(this, function() {
+
+            this.clearSearchMenu();
+            let location = this.searchName.get_text().trim();
+            if (location === "")
+                return 0;
+
+            let item = new Gtk.MenuItem();
+            if (this.spinner.get_parent())
+                this.spinner.reparent(item);
+            item.add(this.spinner);
+            this.searchMenu.append(item);
+            this.searchMenu.show_all();
+            this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName);
+
+            if (this.geolocation_provider == GeolocationProvider.OPENSTREETMAPS) {
+                let params = {
+                    format: 'json',
+                    addressdetails: '1',
+                    q: location
+                };
+
+                this.loadJsonAsync(OPENWEATHER_URL_OSM_FIND, params, Lang.bind(this, function() {
+                    this.clearSearchMenu();
+                    if (!arguments[0]) {
+                        let item = new Gtk.MenuItem({
+                            label: _("Invalid data when searching for \"%s\"").format(location)
+                        });
+                        this.searchMenu.append(item);
+                    } else {
+                        let newCity = arguments[0];
+
+                        if (Number(newCity.length) < 1) {
+                            let item = new Gtk.MenuItem({
+                                label: _("\"%s\" not found").format(location)
+                            });
+                            this.searchMenu.append(item);
+                        } else {
+                            var m = {};
+                            for (var i in newCity) {
+
+                                let cityText = newCity[i].display_name;
+                                let cityCoord = "[" + newCity[i].lat + "," + newCity[i].lon + "]";
+
+                                let item = new Gtk.MenuItem({
+                                    label: cityText + " " + cityCoord
+                                });
+                                item.connect("activate", Lang.bind(this, this.onActivateItem));
+                                this.searchMenu.append(item);
+                            }
+                        }
+                    }
+                    this.searchMenu.show_all();
+                    this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName);
+                    return 0;
+                }));
+            } else if (this.geolocation_provider == GeolocationProvider.MAPQUEST) {
+                if (this.geolocation_appid_mapquest === '') {
+                    this.clearSearchMenu();
+                    let item = new Gtk.MenuItem({
+                        label: "You need an AppKey to search on openmapquest."
+                    });
+                    this.searchMenu.append(item);
+                    item = new Gtk.MenuItem({
+                        label: "Please visit https://developer.mapquest.com/ ."
+                    });
+                    this.searchMenu.append(item);
+                    this.searchMenu.show_all();
+                    this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName);
+                    return 0;
+                }
+                let params = {
+                    key: this.geolocation_appid_mapquest,
+                    format: 'json',
+                    addressdetails: '1',
+                    q: location
+                };
+
+                this.loadJsonAsync(OPENWEATHER_URL_MAPQUEST_FIND, params, Lang.bind(this, function() {
+                    this.clearSearchMenu();
+                    if (!arguments[0]) {
+                        let item = new Gtk.MenuItem({
+                            label: _("Invalid data when searching for \"%s\"").format(location)
+                        });
+                        this.searchMenu.append(item);
+                        item = new Gtk.MenuItem({
+                            label: "Do you use a valid AppKey to search on openmapquest ?"
+                        });
+                        this.searchMenu.append(item);
+                        item = new Gtk.MenuItem({
+                            label: "If not, please visit https://developer.mapquest.com/ ."
+                        });
+                        this.searchMenu.append(item);
+                    } else {
+                        let newCity = arguments[0];
+
+                        if (Number(newCity.length) < 1) {
+                            let item = new Gtk.MenuItem({
+                                label: _("\"%s\" not found").format(location)
+                            });
+                            this.searchMenu.append(item);
+                        } else {
+                            var m = {};
+                            for (var i in newCity) {
+
+                                let cityText = newCity[i].display_name;
+                                let cityCoord = "[" + newCity[i].lat + "," + newCity[i].lon + "]";
+
+                                let item = new Gtk.MenuItem({
+                                    label: cityText + " " + cityCoord
+                                });
+                                item.connect("activate", Lang.bind(this, this.onActivateItem));
+                                this.searchMenu.append(item);
+                            }
+                        }
+                    }
+                    this.searchMenu.show_all();
+                    this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName);
+                    return 0;
+                }));
+            } else if (this.geolocation_provider == GeolocationProvider.GEOCODE) {
+                let params = {
+                    addr: location
+                };
+
+                this.loadJsonAsync(OPENWEATHER_URL_GEOCODE_FIND, params, Lang.bind(this, function() {
+                    this.clearSearchMenu();
+
+                    if (!arguments[0]) {
+                        let item = new Gtk.MenuItem({
+                            label: _("Invalid data when searching for \"%s\"").format(location)
+                        });
+                        this.searchMenu.append(item);
+                    } else {
+                        let newCity = arguments[0].geocoding_results;
+                        if (Number(newCity.length) < 1) {
+                            let item = new Gtk.MenuItem({
+                                label: _("Invalid data when searching for \"%s\"").format(location)
+                            });
+                            this.searchMenu.append(item);
+                        } else {
+                            if (Number(newCity.STATUS.result_count) < 1) {
+                                let item = new Gtk.MenuItem({
+                                    label: _("\"%s\" not found").format(location)
+                                });
+                                this.searchMenu.append(item);
+                            } else {
+                                var m = {};
+                                newCity = newCity.RESULTS;
+                                for (var i in newCity) {
+
+                                    let cityText = newCity[i].formatted_address;
+                                    let cityCoord = "[" + newCity[i].COORDINATES.latitude + "," + newCity[i].COORDINATES.longitude + "]";
+
+                                    let item = new Gtk.MenuItem({
+                                        label: cityText + " " + cityCoord
+                                    });
+                                    item.connect("activate", Lang.bind(this, this.onActivateItem));
+                                    this.searchMenu.append(item);
+                                }
+                            }
+
+                        }
+                    }
+
+                    this.searchMenu.show_all();
+                    this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName);
+                    return 0;
+                }));
+            }
+            return 0;
+        }));
+
+        this.current_spin = this.Window.get_object("spin-current-refresh");
+        this.current_spin.set_value(this.refresh_interval_current / 60);
+        // prevent from continously updating the value
+        this.currentSpinTimeout = undefined;
+        this.current_spin.connect("value-changed", Lang.bind(this, function(button) {
+
+            if (this.currentSpinTimeout !== undefined)
+                Mainloop.source_remove(this.currentSpinTimeout);
+            this.currentSpinTimeout = Mainloop.timeout_add(250, Lang.bind(this, function() {
+                this.refresh_interval_current = 60 * button.get_value();
+                return false;
+            }));
+
+        }));
+
+        this.forecast_spin = this.Window.get_object("spin-forecast-refresh");
+        this.forecast_spin.set_value(this.refresh_interval_forecast / 60);
+        // prevent from continously updating the value
+        this.forecastSpinTimeout = undefined;
+        this.forecast_spin.connect("value-changed", Lang.bind(this, function(button) {
+
+            if (this.forecastSpinTimeout !== undefined)
+                Mainloop.source_remove(this.forecastSpinTimeout);
+            this.forecastSpinTimeout = Mainloop.timeout_add(250, Lang.bind(this, function() {
+                this.refresh_interval_forecast = 60 * button.get_value();
+                return false;
+            }));
+
+        }));
 
         let column = new Gtk.TreeViewColumn();
+        column.set_title(_("Location"));
         this.treeview.append_column(column);
 
         let renderer = new Gtk.CellRendererText();
@@ -123,45 +399,92 @@
         column.set_cell_data_func(renderer, function() {
             arguments[1].markup = arguments[2].get_value(arguments[3], 0);
         });
+        column = new Gtk.TreeViewColumn();
+        column.set_title(_("Provider"));
+        this.treeview.append_column(column);
+
+        column.pack_start(renderer, null);
+
+        column.set_cell_data_func(renderer, function() {
+            arguments[1].markup = arguments[2].get_value(arguments[3], 1);
+        });
+
+
+        let theObjects = this.Window.get_objects();
+        for (let i in theObjects) {
+            let name = theObjects[i].get_name ? theObjects[i].get_name() : 'dummy';
+            if (this[name] !== undefined) {
+                if (theObjects[i].class_path()[1].indexOf('GtkEntry') != -1)
+                    this.initEntry(theObjects[i]);
+                else if (theObjects[i].class_path()[1].indexOf('GtkComboBoxText') != -1)
+                    this.initComboBox(theObjects[i]);
+                else if (theObjects[i].class_path()[1].indexOf('GtkSwitch') != -1)
+                    this.initSwitch(theObjects[i]);
+                this.configWidgets.push([theObjects[i], name]);
+            }
+        }
+        if (Me.metadata.version !== undefined)
+            this.Window.get_object('version').set_label(Me.metadata.version.toString());
+    },
 
-        this.initConfigWidget();
-        this.addLabel(_("Temperature Unit"));
-        this.addComboBox(["\u00b0C", "\u00b0F", "K", "\u00b0Ra", "\u00b0R\u00E9", "\u00b0R\u00F8", "\u00b0De", "\u00b0N"], "units");
-        this.addLabel(_("Wind Speed Unit"));
-        this.addComboBox(["km/h", "mph", "m/s", "kn", "ft/s", "Beaufort"], "wind_speed_unit");
-        this.addLabel(_("Pressure Unit"));
-        this.addComboBox(["hPa", "inHg", "bar", "Pa", "kPa", "atm", "at", "Torr", "psi"], "pressure_unit");
-        this.addLabel(_("Position in Panel"));
-        this.addComboBox([_("Center"), _("Right"), _("Left")], "position_in_panel");
-        this.addLabel(_("Wind Direction by Arrows"));
-        this.addSwitch("wind_direction");
-        this.addLabel(_("Translate Conditions"));
-        this.addSwitch("translate_condition");
-        this.addLabel(_("Symbolic Icons"));
-        this.addSwitch("icon_type");
-        this.addLabel(_("Text on buttons"));
-        this.addSwitch("use_text_on_buttons");
-        this.addLabel(_("Temperature in Panel"));
-        this.addSwitch("text_in_panel");
-        this.addLabel(_("Conditions in Panel"));
-        this.addSwitch("comment_in_panel");
-        this.addLabel(_("Center forecast"));
-        this.addSwitch("center_forecast");
-        this.addLabel(_("Number of days in forecast"));
-        this.addComboBox(["2", "3", "4", "5", "6", "7", "8", "9", "10"], "days_forecast");
-        this.addLabel(_("Maximal number of digits after the decimal point"));
-        this.addComboBox(["0", "1", "2", "3"], "decimal_places");
-        this.addLabel(_("Personal Api key from openweathermap.org"));
-        this.addAppidEntry(("appid"));
+    clearEntry: function() {
+        arguments[0].set_text("");
+    },
+
+    onActivateItem: function() {
+        this.searchName.set_text(arguments[0].get_label());
+    },
+
+    placeSearchMenu: function() {
+        let[gx, gy, gw, gh] = this.searchName.get_window().get_geometry();
+        let[px, py] = this.searchName.get_window().get_position();
+        return [gx + px, gy + py + this.searchName.get_allocated_height()];
+    },
+
+    clearSearchMenu: function() {
+        let children = this.searchMenu.get_children();
+        for (let i in children) {
+            this.searchMenu.remove(children[i]);
+        }
+    },
+
+    initEntry: function(theEntry) {
+        let name = theEntry.get_name();
+        theEntry.text = this[name];
+        if (this[name].length != 32)
+            theEntry.set_icon_from_icon_name(Gtk.PositionType.LEFT, 'dialog-warning');
+
+        theEntry.connect("notify::text", Lang.bind(this, function() {
+            let key = arguments[0].text;
+            this[name] = key;
+            if (key.length == 32)
+                theEntry.set_icon_from_icon_name(Gtk.PositionType.LEFT, '');
+            else
+                theEntry.set_icon_from_icon_name(Gtk.PositionType.LEFT, 'dialog-warning');
+        }));
+    },
+
+    initComboBox: function(theComboBox) {
+        let name = theComboBox.get_name();
+        theComboBox.connect("changed", Lang.bind(this, function() {
+            this[name] = arguments[0].active;
+        }));
+    },
+
+    initSwitch: function(theSwitch) {
+        let name = theSwitch.get_name();
+        theSwitch.connect("notify::active", Lang.bind(this, function() {
+            this[name] = arguments[0].active;
+        }));
     },
 
     refreshUI: function() {
         this.MainWidget = this.Window.get_object("main-widget");
         this.treeview = this.Window.get_object("tree-treeview");
-        this.liststore = this.Window.get_object("liststore");
-        this.Iter = this.liststore.get_iter_first();
+        this.liststore = this.Window.get_object("tree-liststore");
 
         this.Window.get_object("tree-toolbutton-remove").sensitive = Boolean(this.city.length);
+        this.Window.get_object("tree-toolbutton-edit").sensitive = Boolean(this.city.length);
 
         if (mCities != this.city) {
             if (this.liststore !== undefined)
@@ -178,6 +501,7 @@
                 for (let i in city) {
                     current = this.liststore.append();
                     this.liststore.set_value(current, 0, this.extractLocation(city[i]));
+                    this.liststore.set_value(current, 1, this.getProviderShort(this.extractProvider(city[i])));
                 }
             }
 
@@ -187,109 +511,13 @@
         this.changeSelection();
 
         let config = this.configWidgets;
-        for (let i in config)
+        for (let i in config) {
             if (config[i][0].active != this[config[i][1]])
                 config[i][0].active = this[config[i][1]];
-    },
-
-    initConfigWidget: function() {
-        this.inc(1);
-        let a = this.Window.get_object("right-widget-table");
-        a.visible = 1;
-        a.can_focus = 0;
-        this.right_widget = a;
-    },
-
-    x: [0, 1],
-
-    y: [0, 1],
-
-    configWidgets: [],
-
-    inc: function() {
-        if (arguments[0]) {
-            this.x[0] = 0;
-            this.x[1] = 1;
-            this.y[0] = 0;
-            this.y[1] = 1;
-            return 0;
-        }
-
-        if (this.x[0] == 1) {
-            this.x[0] = 0;
-            this.x[1] = 1;
-            this.y[0] += 1;
-            this.y[1] += 1;
-            return 0;
-        } else {
-            this.x[0] += 1;
-            this.x[1] += 1;
-            return 0;
         }
     },
 
-    addLabel: function(text) {
-        let l = new Gtk.Label({
-            label: text,
-            xalign: 0
-        });
-        l.visible = 1;
-        l.can_focus = 0;
-        this.right_widget.attach(l, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
-        this.inc();
-    },
-
-    addComboBox: function(a, b) {
-        let cf = new Gtk.ComboBoxText();
-        this.configWidgets.push([cf, b]);
-        cf.visible = 1;
-        cf.can_focus = 0;
-        cf.width_request = 100;
-        for (let i in a)
-            cf.append_text(a[i]);
-        cf.active = this[b];
-        cf.connect("changed", Lang.bind(this, function() {
-            this[b] = arguments[0].active;
-        }));
-        this.right_widget.attach(cf, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
-        this.inc();
-    },
-
-    addSwitch: function(a) {
-        let sw = new Gtk.Switch();
-        this.configWidgets.push([sw, a]);
-        sw.visible = 1;
-        sw.can_focus = 0;
-        sw.active = this[a];
-        sw.connect("notify::active", Lang.bind(this, function() {
-            this[a] = arguments[0].active;
-        }));
-        this.right_widget.attach(sw, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
-        this.inc();
-    },
-
-    addAppidEntry: function(a) {
-        let en = new Gtk.Entry();
-        this.configWidgets.push([en, a]);
-        en.visible = 1;
-        en.can_focus = 1;
-        en.set_width_chars(32);
-        en.text = this[a];
-        if (this[a].length != 32)
-            en.set_icon_from_icon_name(Gtk.PositionType.LEFT, 'dialog-warning');
-
-        en.connect("notify::text", Lang.bind(this, function() {
-            let key = arguments[0].text;
-            let rgba = new Gdk.Color();
-            this[a] = key;
-            if (key.length == 32)
-                en.set_icon_from_icon_name(Gtk.PositionType.LEFT, '');
-            else
-                en.set_icon_from_icon_name(Gtk.PositionType.LEFT, 'dialog-warning');
-        }));
-        this.right_widget.attach(en, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
-        this.inc();
-    },
+    configWidgets: [],
 
     selectionChanged: function(select) {
         let a = select.get_selected_rows(this.liststore)[0][0];
@@ -299,193 +527,12 @@
                 this.actual_city = parseInt(a.to_string());
     },
 
-    addCity: function() {
-        let textDialog = _("Name of the city");
-
-        let dialog = new Gtk.Dialog({
-            title: ""
-        });
-        let entry = new Gtk.Entry();
-        let completion = new Gtk.EntryCompletion();
-        entry.set_completion(completion);
-        let completionModel = new Gtk.ListStore();
-        completionModel.set_column_types([GObject.TYPE_STRING]);
-        completion.set_model(completionModel);
-        completion.set_text_column(0);
-        completion.set_popup_single_match(true);
-        completion.set_minimum_key_length(1);
-        completion.set_match_func(function(completion, key, iter) {
-            if (iter) {
-                if (completionModel.get_value(iter, 0))
-                    return true;
-            }
-            return false;
-        });
-        entry.margin_top = 12;
-        entry.margin_bottom = 12;
-        let label = new Gtk.Label({
-            label: textDialog
-        });
-
-        dialog.set_border_width(12);
-        dialog.set_modal(1);
-        dialog.set_resizable(0);
-        //dialog.set_transient_for(***** Need parent Window *****);
-
-        dialog.add_button(Gtk.STOCK_CANCEL, 0);
-        let d = dialog.add_button(Gtk.STOCK_OK, 1);
-
-        d.set_can_default(true);
-        d.sensitive = 0;
-
-        dialog.set_default(d);
-        entry.activates_default = true;
-
-        let testLocation = Lang.bind(this, function(location) {
-            if (location.search(/\[/) == -1 || location.search(/\]/) == -1)
-                return 0;
-
-            let id = location.split(/\[/)[1].split(/\]/)[0];
-            if (!id)
-                return 0;
-
-            this.loadJsonAsync(WEATHER_URL_CURRENT, {
-                id: id
-            }, function() {
-                d.sensitive = 0;
-                if (arguments[0] === undefined)
-                    return 0;
-
-                let city = arguments[0];
-
-                if (Number(city.cod) != 200)
-                    return 0;
-
-                if (Number(city.count) === 0)
-                    return 0;
-
-                d.sensitive = 1;
-                return 0;
-            }, "testLocation");
-            return 0;
-        });
-
-        let searchLocation = Lang.bind(this, function() {
-            let location = entry.get_text();
-            let params = {
-                cnt: '30',
-                sort: 'population',
-                type: 'like',
-                units: 'metric',
-                q: location
-            };
-            if (this.appid)
-                params.APPID = this.appid;
-            if (testLocation(location) === 0)
-                this.loadJsonAsync(WEATHER_URL_FIND, params, function() {
-                    if (!arguments[0])
-                        return 0;
-                    let city = arguments[0];
-
-                    if (Number(city.cod) != 200)
-                        return 0;
-
-                    if (Number(city.count) > 0)
-                        city = city.list;
-                    else
-                        return 0;
-
-                    completionModel.clear();
-
-                    let current = this.liststore.get_iter_first();
-
-                    var m = {};
-                    for (var i in city) {
-
-                        current = completionModel.append();
-
-                        let cityText = city[i].name;
-
-                        if (city[i].sys)
-                            cityText += ", " + city[i].sys.country;
-
-                        if (city[i].id)
-                            cityText += " [" + city[i].id + "]";
-
-                        if (m[cityText])
-                            continue;
-                        else
-                            m[cityText] = 1;
-
-                        completionModel.set_value(current, 0, cityText);
-                    }
-
-                    completion.complete();
-                    return 0;
-                }, "getInfo");
-            return 0;
-        });
-
-        entry.connect("changed", searchLocation);
-
-        let dialog_area = dialog.get_content_area();
-        dialog_area.pack_start(label, 0, 0, 0);
-        dialog_area.pack_start(entry, 0, 0, 0);
-        dialog.connect("response", Lang.bind(this, function(w, response_id) {
-            if (response_id) {
-                if (entry.get_text().search(/\[/) == -1 || entry.get_text().search(/\]/) == -1)
-                    return 0;
-
-                let id = entry.get_text().split(/\[/)[1].split(/\]/)[0];
-                if (!id)
-                    return 0;
-
-                let params = {
-                    id: id,
-                    type: 'accurate'
-                };
-                if (this.appid)
-                    params.APPID = this.appid;
-                this.loadJsonAsync(WEATHER_URL_CURRENT, params, Lang.bind(this, function() {
-                    if (!arguments[0])
-                        return 0;
-                    let city = arguments[0];
-
-                    if (Number(city.cod) != 200)
-                        return 0;
-
-                    if (!id)
-                        return 0;
-
-                    if (id != city.id)
-                        return 0;
-
-                    let cityText = entry.get_text().split(/,/)[0];
-
-                    if (city.sys)
-                        cityText += " (" + city.sys.country + ")";
-
-                    if (this.city)
-                        this.city = this.city + " && " + city.id + ">" + cityText;
-                    else
-                        this.city = city.id + ">" + cityText;
-
-                    return 0;
-                }), "lastTest");
-            }
-            dialog.hide();
-            return 0;
-        }));
-
-        dialog.show_all();
-    },
-
     removeCity: function() {
         let city = this.city.split(" && ");
         if (!city.length)
             return 0;
         let ac = this.actual_city;
-        let textDialog = _("Remove %s ?").replace("%s", this.extractLocation(city[ac]));
+        let textDialog = _("Remove %s ?").format(this.extractLocation(city[ac]));
         let dialog = new Gtk.Dialog({
             title: ""
         });
@@ -533,6 +580,64 @@
         return 0;
     },
 
+    editCity: function() {
+        let city = this.city.split(" && ");
+        if (!city.length)
+            return 0;
+        let ac = this.actual_city;
+        this.editName.set_text(this.extractLocation(city[ac]));
+        this.editCoord.set_text(this.extractCoord(city[ac]));
+        this.editCombo.set_active(this.extractProvider(city[ac]) + 1);
+        this.editWidget.show_all();
+        return 0;
+    },
+
+    searchSave: function() {
+        let location = this.searchName.get_text().split(/\[/)[0];
+        let coord = this.searchName.get_text().split(/\[/)[1].split(/\]/)[0];
+        let provider = this.searchCombo.get_active() - 1;
+
+        if (this.city)
+            this.city = this.city + " && " + coord + ">" + location + ">" + provider;
+        else
+            this.city = coord + ">" + location + ">" + provider;
+
+        this.searchWidget.hide();
+        return 0;
+    },
+
+    editSave: function() {
+        let theCity = this.city.split(" && ");
+
+        if (theCity.length === 0)
+            return 0;
+        if (theCity.length > 0 && typeof theCity != "object")
+            theCity = [theCity];
+
+        let ac = this.actual_city;
+        let location = this.editName.get_text();
+        let coord = this.editCoord.get_text();
+        let provider = this.editCombo.get_active() - 1;
+        theCity[ac] = coord + ">" + location + ">" + provider;
+
+        if (theCity.length > 1)
+            this.city = theCity.join(" && ");
+        else if (theCity[0])
+            this.city = theCity[0];
+
+        this.editWidget.hide();
+
+        this.actual_city = ac;
+
+        return 0;
+    },
+
+    editCancel: function() {
+        this.editName.set_text("");
+        this.editCoord.set_text("");
+        this.editWidget.hide();
+    },
+
     changeSelection: function() {
         let path = this.actual_city;
         if (arguments[0])
@@ -543,12 +648,8 @@
 
     loadJsonAsync: function(url, params, fun, id) {
         if (_httpSession === undefined) {
-            if (ExtensionUtils.versionCheck(['3.6'], Config.PACKAGE_VERSION)) {
-                // Soup session (see https://bugzilla.gnome.org/show_bug.cgi?id=661323#c64) (Simon Legner)
-                _httpSession = new Soup.SessionAsync();
-                Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
-            } else
-                _httpSession = new Soup.Session();
+            _httpSession = new Soup.Session();
+            _httpSession.user_agent = this.user_agent;
         }
 
         let here = this;
@@ -583,76 +684,100 @@
     },
 
     loadConfig: function() {
-        this.Settings = Convenience.getSettings(WEATHER_SETTINGS_SCHEMA);
+        this.Settings = Convenience.getSettings(OPENWEATHER_SETTINGS_SCHEMA);
         this.Settings.connect("changed", Lang.bind(this, function() {
             this.refreshUI();
         }));
     },
 
+    get weather_provider() {
+        if (!this.Settings)
+            this.loadConfig();
+        return this.Settings.get_enum(OPENWEATHER_PROVIDER_KEY);
+    },
+
+    set weather_provider(v) {
+        if (!this.Settings)
+            this.loadConfig();
+        this.Settings.set_enum(OPENWEATHER_PROVIDER_KEY, v);
+    },
+
+    get geolocation_provider() {
+        if (!this.Settings)
+            this.loadConfig();
+        return this.Settings.get_enum(OPENWEATHER_GEOLOCATION_PROVIDER_KEY);
+    },
+
+    set geolocation_provider(v) {
+        if (!this.Settings)
+            this.loadConfig();
+        this.Settings.set_enum(OPENWEATHER_GEOLOCATION_PROVIDER_KEY, v);
+    },
+
     get units() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_enum(WEATHER_UNIT_KEY);
+        return this.Settings.get_enum(OPENWEATHER_UNIT_KEY);
     },
 
     set units(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_enum(WEATHER_UNIT_KEY, v);
+        this.Settings.set_enum(OPENWEATHER_UNIT_KEY, v);
     },
 
     get pressure_unit() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_enum(WEATHER_PRESSURE_UNIT_KEY);
+        return this.Settings.get_enum(OPENWEATHER_PRESSURE_UNIT_KEY);
     },
 
     set pressure_unit(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_enum(WEATHER_PRESSURE_UNIT_KEY, v);
+        this.Settings.set_enum(OPENWEATHER_PRESSURE_UNIT_KEY, v);
     },
 
     get wind_speed_unit() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_enum(WEATHER_WIND_SPEED_UNIT_KEY);
+        return this.Settings.get_enum(OPENWEATHER_WIND_SPEED_UNIT_KEY);
     },
 
     set wind_speed_unit(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_enum(WEATHER_WIND_SPEED_UNIT_KEY, v);
+        this.Settings.set_enum(OPENWEATHER_WIND_SPEED_UNIT_KEY, v);
     },
 
     get wind_direction() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_WIND_DIRECTION_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_WIND_DIRECTION_KEY);
     },
 
     set wind_direction(v) {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.set_boolean(WEATHER_WIND_DIRECTION_KEY, v);
+        return this.Settings.set_boolean(OPENWEATHER_WIND_DIRECTION_KEY, v);
     },
 
     get city() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_string(WEATHER_CITY_KEY);
+        return this.Settings.get_string(OPENWEATHER_CITY_KEY);
     },
 
     set city(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_string(WEATHER_CITY_KEY, v);
+        this.Settings.set_string(OPENWEATHER_CITY_KEY, v);
     },
 
     get actual_city() {
         if (!this.Settings)
             this.loadConfig();
-        let a = this.Settings.get_int(WEATHER_ACTUAL_CITY_KEY);
+        let a = this.Settings.get_int(OPENWEATHER_ACTUAL_CITY_KEY);
         let citys = this.city.split(" && ");
 
         if (citys && typeof citys == "string")
@@ -691,165 +816,245 @@
         if (a > l)
             a = l;
 
-        this.Settings.set_int(WEATHER_ACTUAL_CITY_KEY, a);
+        this.Settings.set_int(OPENWEATHER_ACTUAL_CITY_KEY, a);
     },
 
     get translate_condition() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_TRANSLATE_CONDITION_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_TRANSLATE_CONDITION_KEY);
     },
 
     set translate_condition(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_boolean(WEATHER_TRANSLATE_CONDITION_KEY, v);
+        this.Settings.set_boolean(OPENWEATHER_TRANSLATE_CONDITION_KEY, v);
     },
 
     get icon_type() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_USE_SYMBOLIC_ICONS_KEY);
     },
 
     set icon_type(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY, v);
+        this.Settings.set_boolean(OPENWEATHER_USE_SYMBOLIC_ICONS_KEY, v);
     },
 
     get use_text_on_buttons() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_USE_TEXT_ON_BUTTONS_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_USE_TEXT_ON_BUTTONS_KEY);
     },
 
     set use_text_on_buttons(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_boolean(WEATHER_USE_TEXT_ON_BUTTONS_KEY, v);
+        this.Settings.set_boolean(OPENWEATHER_USE_TEXT_ON_BUTTONS_KEY, v);
     },
 
     get text_in_panel() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_SHOW_TEXT_IN_PANEL_KEY);
     },
 
     set text_in_panel(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY, v);
+        this.Settings.set_boolean(OPENWEATHER_SHOW_TEXT_IN_PANEL_KEY, v);
     },
 
     get position_in_panel() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_enum(WEATHER_POSITION_IN_PANEL_KEY);
+        return this.Settings.get_enum(OPENWEATHER_POSITION_IN_PANEL_KEY);
     },
 
     set position_in_panel(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_enum(WEATHER_POSITION_IN_PANEL_KEY, v);
+        this.Settings.set_enum(OPENWEATHER_POSITION_IN_PANEL_KEY, v);
     },
 
     get comment_in_panel() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_SHOW_COMMENT_IN_PANEL_KEY);
     },
 
     set comment_in_panel(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v);
+        this.Settings.set_boolean(OPENWEATHER_SHOW_COMMENT_IN_PANEL_KEY, v);
+    },
+
+    get comment_in_forecast() {
+        if (!this.Settings)
+            this.loadConfig();
+        return this.Settings.get_boolean(OPENWEATHER_SHOW_COMMENT_IN_FORECAST_KEY);
+    },
+
+    set comment_in_forecast(v) {
+        if (!this.Settings)
+            this.loadConfig();
+        this.Settings.set_boolean(OPENWEATHER_SHOW_COMMENT_IN_FORECAST_KEY, v);
     },
 
     get refresh_interval_current() {
         if (!this.Settings)
             this.loadConfig();
-        let v = this.Settings.get_int(WEATHER_REFRESH_INTERVAL_CURRENT);
+        let v = this.Settings.get_int(OPENWEATHER_REFRESH_INTERVAL_CURRENT);
         return ((v >= 600) ? v : 600);
     },
 
     set refresh_interval_current(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_int(WEATHER_REFRESH_INTERVAL_CURRENT, ((v >= 600) ? v : 600));
+        this.Settings.set_int(OPENWEATHER_REFRESH_INTERVAL_CURRENT, ((v >= 600) ? v : 600));
     },
 
     get refresh_interval_forecast() {
         if (!this.Settings)
             this.loadConfig();
-        let v = this.Settings.get_int(WEATHER_REFRESH_INTERVAL_FORECAST);
+        let v = this.Settings.get_int(OPENWEATHER_REFRESH_INTERVAL_FORECAST);
         return ((v >= 600) ? v : 600);
     },
 
     set refresh_interval_forecast(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_int(WEATHER_REFRESH_INTERVAL_FORECAST, ((v >= 600) ? v : 600));
+        this.Settings.set_int(OPENWEATHER_REFRESH_INTERVAL_FORECAST, ((v >= 600) ? v : 600));
     },
 
     get center_forecast() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_boolean(WEATHER_CENTER_FORECAST_KEY);
+        return this.Settings.get_boolean(OPENWEATHER_CENTER_FORECAST_KEY);
     },
 
     set center_forecast(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_boolean(WEATHER_CENTER_FORECAST_KEY, v);
+        this.Settings.set_boolean(OPENWEATHER_CENTER_FORECAST_KEY, v);
     },
 
     get days_forecast() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_int(WEATHER_DAYS_FORECAST) - 2;
+        return this.Settings.get_int(OPENWEATHER_DAYS_FORECAST) - 2;
     },
 
     set days_forecast(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_int(WEATHER_DAYS_FORECAST, v + 2);
+        this.Settings.set_int(OPENWEATHER_DAYS_FORECAST, v + 2);
     },
 
     get decimal_places() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_int(WEATHER_DECIMAL_PLACES);
+        return this.Settings.get_int(OPENWEATHER_DECIMAL_PLACES);
     },
 
     set decimal_places(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_int(WEATHER_DECIMAL_PLACES, v);
+        this.Settings.set_int(OPENWEATHER_DECIMAL_PLACES, v);
     },
 
     get appid() {
         if (!this.Settings)
             this.loadConfig();
-        return this.Settings.get_string(WEATHER_OWM_API_KEY);
+        return this.Settings.get_string(OPENWEATHER_OWM_API_KEY);
     },
 
     set appid(v) {
         if (!this.Settings)
             this.loadConfig();
-        this.Settings.set_string(WEATHER_OWM_API_KEY, v);
+        this.Settings.set_string(OPENWEATHER_OWM_API_KEY, v);
     },
 
-    extractLocation: function(a) {
-        if (a.search(">") == -1)
+    get use_default_owm_key() {
+        if (!this.Settings)
+            this.loadConfig();
+        return this.Settings.get_boolean(OPENWEATHER_USE_DEFAULT_OWM_API_KEY);
+    },
+
+    set use_default_owm_key(v) {
+        if (!this.Settings)
+            this.loadConfig();
+        this.Settings.set_boolean(OPENWEATHER_USE_DEFAULT_OWM_API_KEY, v);
+    },
+
+    get appid_fc() {
+        if (!this.Settings)
+            this.loadConfig();
+        return this.Settings.get_string(OPENWEATHER_FC_API_KEY);
+    },
+
+    set appid_fc(v) {
+        if (!this.Settings)
+            this.loadConfig();
+        this.Settings.set_string(OPENWEATHER_FC_API_KEY, v);
+    },
+
+    get geolocation_appid_mapquest() {
+        if (!this.Settings)
+            this.loadConfig();
+        return this.Settings.get_string(OPENWEATHER_GC_APP_KEY);
+    },
+
+    set geolocation_appid_mapquest(v) {
+        if (!this.Settings)
+            this.loadConfig();
+        this.Settings.set_string(OPENWEATHER_GC_APP_KEY, v);
+    },
+
+    extractLocation: function() {
+        if (!arguments[0])
+            return "";
+
+        if (arguments[0].search(">") == -1)
             return _("Invalid city");
-        return a.split(">")[1];
+        return arguments[0].split(">")[1];
     },
 
-    extractId: function(a) {
-        if (a.search(">") == -1)
+    extractCoord: function() {
+        if (!arguments[0])
+            return 0;
+
+        if (arguments[0].search(">") == -1)
             return 0;
-        return a.split(">")[0];
+        return arguments[0].split(">")[0];
+    },
+
+    extractProvider: function() {
+        if (!arguments[0])
+            return -1;
+        if (arguments[0].split(">")[2] === undefined)
+            return -1;
+        if (isNaN(parseInt(arguments[0].split(">")[2])))
+            return -1;
+        return parseInt(arguments[0].split(">")[2]);
+    },
+
+    getProviderShort: function() {
+        let provider = arguments[0];
+        if (provider === undefined)
+            provider = this.extractProvider(this.city[this.actual_city]);
+
+        switch (provider) {
+            case WeatherProvider.OPENWEATHERMAP:
+                return "openweathermap.org";
+            case WeatherProvider.FORECAST_IO:
+                return "forecast.io";
+            default:
+            case WeatherProvider.DEFAULT:
+                return _("default");
+        }
     }
 });
 
diff -Nru gnome-shell-extension-weather-0~20140924.git7e28508/update_revision.sh gnome-shell-extension-weather-0~20151114.git609/update_revision.sh
--- gnome-shell-extension-weather-0~20140924.git7e28508/update_revision.sh	2014-09-24 18:18:58.000000000 +0000
+++ gnome-shell-extension-weather-0~20151114.git609/update_revision.sh	2015-11-17 15:10:32.000000000 +0000
@@ -1,9 +1,37 @@
 #!/bin/sh
+#
+#
+#  Weather extension for GNOME Shell
+#  - generate SPEC-,SOURCES- and SRPM-files from latest git-master and move them
+#    into the appropriate directories
+#  - you need to check the paths and fix the maintainers name
+#
+# Copyright (C) 2012 - 2015
+#     Jens Lody <jens@jenslody.de>,
+#
+# This file is part of gnome-shell-extension-openweather.
+#
+# gnome-shell-extension-openweather is free software: you can
+# redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# gnome-shell-extension-openweather is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with gnome-shell-extension-openweather.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
 
 GITHUB="jenslody-gnome-shell-extension-openweather"
 BASE_URL="https://github.com/jenslody/gnome-shell-extension-openweather/tarball/master/"
-TARBALL_PATH="/home/jens/rpmbuild/SOURCES/"
-SPEC_PATH="/home/jens/rpmbuild/SPECS/"
+TARBALL_PATH="${HOME}/rpmbuild/SOURCES/"
+SPEC_PATH="${HOME}/rpmbuild/SPECS/"
 SPEC_FILE="gnome-shell-extension-openweather.spec"
 
 SCRIPT_DIR=`dirname "$0"`
@@ -38,10 +66,21 @@
 
 echo "Found revision: '${COMMIT}'"
 
-mv ${SPEC_FILE} ${SPEC_FILE}.tmp
-sed "1 s/%global git .*/%global git $COMMIT/" < ${SPEC_FILE}.tmp > ${SPEC_FILE}
-rm -f ${SPEC_FILE}.tmp
+DATE=`date +%Y%m%d`
+
+echo "Use checkout-date: '${DATE}'"
+
+cp ${SPEC_FILE} ${SPEC_FILE}.tmp
+sed -i "s/%global git .*/%global git $COMMIT/"  ${SPEC_FILE}
+sed -i "s/%global checkout_date .*/%global checkout_date $DATE/" ${SPEC_FILE}
+
+rpmdev-bumpspec --comment="Fresh git checkout." --userstring="Jens Lody <fedora@jenslody.de>" ${SPEC_FILE}
+
+vi ${SPEC_FILE}
+
 cp ${SPEC_FILE} ${SPEC_PATH}${SPEC_FILE}
+rm -f ${SPEC_FILE}
+mv ${SPEC_FILE}.tmp ${SPEC_FILE}
 
 rm -f ${TARBALL_PATH}${GITHUB}-*.tar.gz
 wget -c ${BASE_URL}${GITHUB}-${COMMIT}.tar.gz -O ${TARBALL_PATH}${GITHUB}-${COMMIT}.tar.gz