weather-indicator-team team mailing list archive
-
weather-indicator-team team
-
Mailing list archive
-
Message #00132
[Merge] lp:weather-indicator/2.0 into lp:weather-indicator
Joshua has proposed merging lp:weather-indicator/2.0 into lp:weather-indicator.
Requested reviews:
Weather Indicator Team (weather-indicator-team)
Related bugs:
Bug #721714 in Weather Indicator: "Refresh label should contain info about time from last refresh"
https://bugs.launchpad.net/weather-indicator/+bug/721714
Bug #804659 in Weather Indicator: "Mist is not displayed in Forecast"
https://bugs.launchpad.net/weather-indicator/+bug/804659
Bug #808538 in Weather Indicator: "Packages indicator-weather & indicator-desktopnova fail to install/upgrade: post-installation error 127"
https://bugs.launchpad.net/weather-indicator/+bug/808538
Bug #809187 in Weather Indicator: "indicator-weather crashed with IndexError in finish_initializing(): list index out of range"
https://bugs.launchpad.net/weather-indicator/+bug/809187
Bug #838369 in Weather Indicator: "Feature Request: When choosing wind-speed in "Knots", direction should be in degrees."
https://bugs.launchpad.net/weather-indicator/+bug/838369
Bug #853774 in Weather Indicator: "Dialog command buttons can't be focused"
https://bugs.launchpad.net/weather-indicator/+bug/853774
Bug #886028 in Weather Indicator: "Forecast crash: ValueError: could not convert string to float: Unknown"
https://bugs.launchpad.net/weather-indicator/+bug/886028
Bug #917253 in Weather Indicator: "indicator-weather applet is writing debug messages frequently to disk"
https://bugs.launchpad.net/weather-indicator/+bug/917253
Bug #964365 in Weather Indicator: "Weather indicator fails to update anything when earthtools.org is down"
https://bugs.launchpad.net/weather-indicator/+bug/964365
For more details, see:
https://code.launchpad.net/~roignac/weather-indicator/cloudy/+merge/164597
This fixes all the "SIGSEGV" bugs related to glib/dbus; (libdbus is not thread-safe - I re-wrote some of the threading code to deal with this)
I also updated it to use Gtk3 and GObject, instead of the now-deprecated PyGtk.
Finally, I added code to calculate humidex/wind chill, and added a related tab to the Preferences Dialog.
Note that this version requires pywapi 0.3.1, which is available here:
http://code.google.com/p/python-weather-api/downloads/detail?name=pywapi-0.3.1.tar.gz
deb packages for pywapi 0.3.1 are available here:
https://launchpad.net/~pywapi-devel
>From the changelog:
* Ported to GTK3 and GObject from PyGTK
* Rewrite threading code to avoid dbus-related crashes (LP: #743541)
* Added "feels like" temperature (humidex/heat index/wind chill)
* New "Conditions" tab in Preferences dialog to choose temperature
formulas and toggle display of some condition information
* Bumped version number to reflect massive changes
Note that it still sometimes gives LIBDBUSMENU-GLIB warnings to .xsession-errors, but they can be safely ignored - I have left it running for a week straight with no crashes.
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~roignac/weather-indicator/cloudy/+merge/164597
Your team Weather Indicator Team is requested to review the proposed merge of lp:weather-indicator/2.0 into lp:weather-indicator.
=== added file '.quickly'
--- .quickly 1970-01-01 00:00:00 +0000
+++ .quickly 2013-05-18 18:22:26 +0000
@@ -0,0 +1,7 @@
+project = indicator-weather
+version = 0.4.3
+template = ubuntu-application
+lp_id = weather-indicator
+ppa = weather-indicator/weather-indicator-experimental
+bzrbranch = lp:weather-indicator
+dependencies =
=== modified file 'AUTHORS'
--- AUTHORS 2012-11-22 07:31:39 +0000
+++ AUTHORS 2013-05-18 18:22:26 +0000
@@ -1,5 +1,11 @@
+<<<<<<< TREE
Copyright (C) 2010 Sebastian MacDonald <Sebas310@xxxxxxxxx>
Copyright (C) 2010 Mehdi Rejraji <mehd36@xxxxxxxxx>
Copyright (C) 2010 Vadim Rutkovsky <roignac@xxxxxxxxx>
Copyright (C) 2011 Panagiotis Skintzos <panajotis@xxxxxxxxx>
Copyright (c) 2012 Benjamin Kerensa <bkerensa@xxxxxxxxxx>
+=======
+Copyright (C) 2010 Sebastian MacDonald Sebas310@xxxxxxxxx
+Copyright (C) 2010 Mehdi Rejraji mehd36@xxxxxxxxx
+Copyright (C) 2010 Vadim Rutkovsky roignac@xxxxxxxxx
+>>>>>>> MERGE-SOURCE
=== added directory 'bin'
=== added file 'bin/indicator-weather'
--- bin/indicator-weather 1970-01-01 00:00:00 +0000
+++ bin/indicator-weather 2013-05-18 18:22:26 +0000
@@ -0,0 +1,1989 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+### BEGIN LICENSE
+# Copyright (C) 2010 Sebastian MacDonald Sebas310@xxxxxxxxx
+# Copyright (C) 2010 Mehdi Rejraji mehd36@xxxxxxxxx
+# Copyright (C) 2011 Vadim Rutkovsky roignac@xxxxxxxxx
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+try:
+ from gi.repository import Gio
+except ImportError:
+ pass
+import sys, os, shutil, tempfile
+import gtk, pygtk, gobject, pynotify
+pygtk.require('2.0')
+import appindicator
+import urllib2, urllib
+from urllib import urlencode
+import re
+import locale
+from xml.dom.minidom import parseString
+import datetime
+import dbus
+import time
+import traceback
+import types
+# Will be used for humidex
+#import math
+import commands, threading
+import logging, logging.handlers
+import pywapi
+
+import gettext
+from gettext import gettext as _
+from gettext import ngettext as __
+gettext.textdomain('indicator-weather')
+
+# Add project root directory (enable symlink, and trunk execution).
+PROJECT_ROOT_DIRECTORY = os.path.abspath(
+ os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
+
+if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'indicator_weather'))
+ and PROJECT_ROOT_DIRECTORY not in sys.path):
+ sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
+ os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses
+
+VERSION = "12.07.30 'Cloudy 10'"
+
+from indicator_weather.helpers import *
+
+INFO_TYPE = 'type'
+INFO_SETTING = 'setting'
+
+class Settings:
+ """ Class to read/write settings """
+ db = None
+ BASE_KEY = 'apps.indicators.weather'
+ WEATHER_KEY = 'weather'
+ LOCATIONS_KEY = 'locations'
+ INDICATOR_DISPLAY = 'show_label'
+ NOTIFICATIONS = 'notif'
+ WEATHER_SOURCE = 'data_source'
+ REFRESH_RATE = 'refresh_rate'
+ METRIC_SYSTEM = 'unit'
+ WIND_UNIT = 'wind'
+ PLACECHOSEN = 'placechosen'
+ PLACES = 'places'
+
+ # info dict
+ # INFO_TYPE : Python type
+ # INFO_SETTING : dconf setting name
+ INFO = {
+ INDICATOR_DISPLAY : {
+ INFO_TYPE : types.IntType,
+ INFO_SETTING : 'indicator-display'
+ },
+ NOTIFICATIONS : {
+ INFO_TYPE : types.StringType,
+ INFO_SETTING : 'notifications'
+ },
+ WEATHER_SOURCE : {
+ INFO_TYPE : types.StringType,
+ INFO_SETTING : 'weather-source'
+ },
+ REFRESH_RATE : {
+ INFO_TYPE : types.IntType,
+ INFO_SETTING : 'refresh-rate'
+ },
+ METRIC_SYSTEM : {
+ INFO_TYPE : types.StringType,
+ INFO_SETTING : 'metric-system'
+ },
+ WIND_UNIT : {
+ INFO_TYPE : types.StringType,
+ INFO_SETTING : 'wind-unit'
+ },
+ PLACECHOSEN : {
+ INFO_TYPE : types.IntType,
+ INFO_SETTING: 'placechosen'
+ },
+ PLACES : {
+ INFO_TYPE : types.ListType,
+ INFO_SETTING: 'places'
+ },
+ }
+
+ # Open the DB
+ def prepare_settings_store(self):
+ log.debug("Settings: preparing settings store")
+ try:
+ self.db = Gio.Settings.new(self.BASE_KEY)
+ except Exception as e:
+ log.debug("Settings: exception occurred while opening settings:\n %s" % str(e))
+
+ # Make sure autostart file is installed. Inspired by GTG.
+ def check_autostart(self):
+ autostart_dir = os.path.join(os.path.expanduser("~"),".config/autostart/")
+ autostart_file = "indicator-weather.desktop"
+ autostart_path = os.path.join(autostart_dir, autostart_file)
+ if not os.path.isfile(autostart_path):
+ #Look for the desktop file
+ desktop_file_path = None
+ desktop_file_directories = ["/usr/share/applications",
+ "/usr/local/share/applications"]
+ this_directory = os.path.dirname(os.path.abspath(__file__))
+ for path in desktop_file_directories:
+ fullpath = os.path.normpath(os.path.join(this_directory, path, \
+ autostart_file))
+ if os.path.isfile(fullpath):
+ desktop_file_path = fullpath
+ break
+ #If we have found the desktop file, we make a link to in in
+ # autostart_path.
+ if desktop_file_path:
+ if not os.path.exists(autostart_dir):
+ os.mkdir(autostart_dir)
+ if os.path.isdir(autostart_dir):
+ log.debug("Installing autostart file.")
+ os.symlink(desktop_file_path, autostart_path)
+
+ # Get a value of the setting
+ def get_value(self, setting, return_id = False):
+ log.debug("Settings: getting value for %s" % setting)
+ setting_name = Settings.INFO[setting][INFO_SETTING]
+ try:
+ setting_type = Settings.INFO[setting][INFO_TYPE]
+ get_func = {
+ types.IntType: self.db.get_int,
+ types.StringType: self.db.get_string,
+ types.BooleanType: self.db.get_boolean,
+ types.ListType: self.db.get_string,
+ types.DictType: self.db.get_string,
+ types.NoneType: self.db.get_value,
+ }[setting_type]
+ return get_func(setting_name)
+ except:
+ self.log.debug("Settings: can't find value for %s" % setting)
+ return None
+
+ # Set a setting value
+ def set_value(self, setting, value):
+
+ value = '' if value is None else value
+ value = str(value) if type(value) is types.ListType else value
+ log.debug("Settings: setting '%s'='%s'" % (setting, value))
+
+ setting_name = Settings.INFO[setting][INFO_SETTING]
+ try:
+ setting_type = Settings.INFO[setting][INFO_TYPE]
+ set_func = {
+ types.IntType: self.db.set_int,
+ types.StringType: self.db.set_string,
+ types.BooleanType: self.db.set_boolean,
+ types.ListType: self.db.set_string,
+ types.DictType: self.db.set_string,
+ types.NoneType: self.db.set_value,
+ }[setting_type]
+ set_func(setting_name, value)
+ except:
+ log.debug( \
+ "Settings: schema for '%s' not found, aborting" % setting)
+
+ # Get cached weather by location code.
+ # If return_id is True, only document id is returned, otherwise - full weather data
+ def get_weather(self, location_code, return_id = False):
+ log.debug("Settings: getting cached weather for %s" % \
+ location_code)
+ try:
+ cached_weather_string = self.db.get_string(self.WEATHER_KEY)
+ cached_weather = {} if cached_weather_string == ''\
+ else eval(cached_weather_string)
+ if location_code in cached_weather.keys():
+ return str(cached_weather[location_code])
+ else:
+ log.debug(\
+ "Settings: can't find value for %s" % location_code)
+ return None
+ except:
+ log.debug("Settings: can't find %s setting" % WEATHER_KEY)
+ return None
+
+ # Save weather info in cache for specific location
+ def save_weather(self, weather, location_code):
+
+ record = {
+ "label" : weather.get_temperature(needs_rounding=True),
+ "condition": weather.get_condition_label(),
+ "icon" : weather.get_icon_name(),
+ "temper" : weather.get_temperature_label(),
+ "humidex" : weather.get_humidex_label(),
+ "humidity" : weather.get_humidity_label(),
+ "wind" : weather.get_wind_label(),
+ "sunrise" : weather.get_sunrise_label(),
+ "sunset" : weather.get_sunset_label()
+ }
+ log.debug("Settings: setting '%s'='%s'" % (location_code, record))
+
+ try:
+ cached_weather_string = self.db.get_string(self.WEATHER_KEY)
+ cached_weather = {} if cached_weather_string == ''\
+ else eval(cached_weather_string)
+ cached_weather[location_code] = record
+ cached_weather_string = str(cached_weather)
+ self.db.set_string(self.WEATHER_KEY, cached_weather_string)
+ except:
+ log.debug(\
+ "Settings: schema for '%s' not found, aborting" % setting)
+
+ # Get location details by location code
+ # If return_id is True, only document id is returned, otherwise - full location data
+ def get_location_details(self, location_code, return_id = False):
+ try:
+ locations_string = self.db.get_string(self.LOCATIONS_KEY)
+ locations = {} if locations_string == ''\
+ else eval(locations_string)
+ if location_code in locations.keys():
+ return str(locations[location_code])
+ else:
+ log.debug(\
+ "Settings: can't find value for %s" % location_code)
+ return None
+ except:
+ log.debug("Settings: can't find location details for %s" % \
+ location_code)
+ return None
+
+ # Save location details
+ def save_location_details(self, location_details, location_code):
+ log.debug("Settings: setting '%s'='%s'" %\
+ (location_code, location_details))
+
+ try:
+ locations_string = self.db.get_string(self.LOCATIONS_KEY)
+ locations = {} if locations_string == ''\
+ else eval(locations_string)
+ locations[location_code] = location_details
+ locations_string = str(locations)
+ self.db.set_string(self.LOCATIONS_KEY, locations_string)
+ except:
+ pass
+
+class MetricSystem:
+ """ Class with available metric systems units """
+ SI = 1
+ IMPERIAL = 2
+
+class WindUnits:
+ """ Class for available wind unit systems """
+ MPS = 1
+ MPH = 2
+ BEAUFORT = 3
+ KPH = 4
+ KNOTS = 5
+
+class WeatherDataSource:
+ """ Class for available weather data sources """
+ GOOGLE = 1
+ YAHOO = 2
+
+class Location:
+ """ Data object to store location details """
+
+ # Initialize an object with a label
+ def __init__(self, metric_system, wind_unit, location_details = None):
+ self.metric_system = metric_system
+ self.wind_unit = wind_unit
+ self.location_details = location_details
+
+ # Convert coordinate for google
+ def convert_coordinate_for_google(self, value):
+ value = float(value) * 1e6
+ return int(round(value))
+
+ # Get necessary location details by its GeoNames details
+ def prepare_location(self, geonames_details):
+ self.location_details = {}
+ self.location_details['full name'] = geonames_details[0]
+ self.location_details['latitude'] = geonames_details[2]
+ self.location_details['longitude'] = geonames_details[3]
+ self.prepare_location_for_google(geonames_details)
+ self.prepare_location_for_yahoo(geonames_details)
+ #TODO: Get noaa id from geonames service
+ self.location_details['noaa id'] = "woot"
+
+ # check mandatory attributes
+ if not hasattr(self, 'location_code') or \
+ 'latitude' not in self.location_details or \
+ 'longitude' not in self.location_details:
+ return False
+
+ # check that we have at least one supported data source
+ if 'google id' not in self.location_details and \
+ 'yahoo id' not in self.location_details:
+ log.error(("Location '%s'" %
+ self.location_details['full name'])) + \
+ "is not supported by current data sources"
+ return False
+
+ return True
+
+ def prepare_location_for_google(self, geonames_details):
+ # Format latitude and longitude for Google needs
+ try:
+ lat = self.convert_coordinate_for_google(geonames_details[2])
+ lon = self.convert_coordinate_for_google(geonames_details[3])
+ self.location_details['google id'] = ",,,%s,%s" % (lat, lon)
+
+ except Exception, e:
+ log.error(e)
+
+ def prepare_location_for_yahoo(self, geonames_details):
+ # Get location details in english for Yahoo
+ baseurl = 'http://api.geonames.org/getJSON'
+ params = {'geonameId': geonames_details[1], 'username': 'indicatorweather'}
+ url = '?'.join((baseurl, urlencode(params)))
+ log.debug("Location: Get GeoNames location details, url %s" % url)
+ try:
+ city = eval(urllib2.urlopen(url).read())
+ if 'adminName1' in city:
+ displayed_city_name = "%s, %s, %s" % (city['name'], city['adminName1'], city['countryName'])
+ elif 'name' in city:
+ displayed_city_name = "%s, %s" % (city['name'], city['countryName'])
+ else:
+ log.error("Location: Cannot find GeoNames info for code %s Full Response:\n %s" % (geonames_details[1], str(city)))
+ return
+
+ # Get YAHOO WOEID by english name of location
+ baseurl = 'http://where.yahooapis.com/geocode'
+ params = {'location': displayed_city_name, 'appid': 'mOawLd4s', 'flags': 'J'}
+ url = '?'.join((baseurl, urlencode(params)))
+ log.debug("Location: Get Yahoo WOEID, url %s" % url)
+ f = urllib2.urlopen(url)
+ s=f.read()
+ null = None
+ yahoo_woeid_result = eval(s)
+ if (yahoo_woeid_result['ResultSet']['Error'] != 0) and (yahoo_woeid_result['ResultSet']['Results'] != None):
+ log.error("Location: Yahoo woeid return error. Full response:\n %s" % str(yahoo_woeid_result))
+ return
+ else:
+ woeid = yahoo_woeid_result['ResultSet']['Results'][0]['woeid']
+ self.location_code = woeid
+ log.debug("Location: woeid is %s" % woeid)
+
+ # Get old Yahoo id by woeid
+ url = 'http://weather.yahooapis.com/forecastrss?w=%s' % woeid
+ log.debug("Location: Get Yahoo RSS ID, url %s" % url)
+ f = urllib2.urlopen(url)
+ s=f.read()
+ parsed = parseString(s)
+ #TODO: Add a try-catch for empty guid_value
+ guid = parsed.getElementsByTagName("guid")
+ if len(guid) > 0:
+ guid_value = guid[0].firstChild.nodeValue
+ p = re.compile('([^_]*)_')
+ m = p.match(guid_value)
+ if m:
+ self.location_details['yahoo id'] = m.group(1)
+ log.debug("Location: yahoo id is %s" % self.location_details['yahoo id'])
+ else:
+ log.error("Location: Can't find yahoo id via woeid. Full response:\n %s" % guid_value)
+ return
+ else:
+ log.error("Location: Can't guid in yahoo RSS response. Full response:\n %s" % s)
+ return
+
+ except urllib2.URLError:
+ log.error("Location: error reaching url '%s'" % url)
+
+ except Exception, e:
+ log.error(e)
+
+ # Return lcoation code and location details
+ def export_location_details(self):
+ return (self.location_code, self.location_details)
+
+ # Get fresh weather data and store it to weather object
+ def update_weather_data(self, source):
+ # gather existing source keys
+ valid_source = None
+ loc_ids = {}
+
+ SOURCES = {
+ WeatherDataSource.GOOGLE : ("google id", "Google"),
+ WeatherDataSource.YAHOO : ("yahoo id", "Yahoo"),
+ }
+
+ for source_id in SOURCES.keys():
+ if SOURCES[source_id][0] in self.location_details:
+ loc_ids[source_id] = SOURCES[source_id][0]
+
+ # try with the default source
+ if source in loc_ids:
+ valid_source = source
+ log.debug(("Location: default weather source '%s' " +
+ "chosen for '%s'") % (SOURCES[valid_source][1],
+ self.location_details['label']))
+
+ # try with the first alternative
+ elif len(loc_ids.keys()):
+ valid_source = loc_ids.keys()[0]
+ log.debug(("Location: non default weather source '%s' " +
+ "chosen for '%s'") % (SOURCES[valid_source][1],
+ self.location_details['label']))
+
+ if valid_source is None:
+ log.error(("Location: no valid weather source can be " +
+ "chosen for '%s'") % (
+ self.location_details['label']))
+ self.weather = None
+ else:
+ self.weather = Weather(
+ self.location_details[loc_ids[valid_source]],
+ valid_source, self.metric_system, self.wind_unit,
+ self.location_details['latitude'],
+ self.location_details['longitude'])
+
+class Forecast:
+ """ Class to get forecast information """
+
+ # Initialize a class with metric system, wind units, location and current user locale
+ def __init__ (self, units, lat, lon, locale):
+ self.metric_system = units
+ self.lat = self.convert_coordinate_for_google(lat)
+ self.lon = self.convert_coordinate_for_google(lon)
+ self.locale = locale
+
+ # Convert coordinate for google
+ def convert_coordinate_for_google(self, value):
+ value = float(value) * 1e6
+ return int(round(value))
+
+ # Get and store forecast data. For now using Google only
+ def prepare_forecast_data(self):
+ self.daysofweek = []
+ self.icons = []
+ self.conditions = []
+ self.error_message = None
+ try:
+ # Generate a fake location by current coordinates
+ location_name = ",,,%s,%s" % (self.lat, self.lon)
+ self.forecast = pywapi.get_weather_from_google (location_name, hl = self.locale)
+ self.unitsystem = self.forecast['forecast_information']['unit_system']
+
+ for forecast in self.forecast['forecasts']:
+ self.daysofweek.append(forecast["day_of_week"])
+ forecast_icon = str(forecast["icon"])
+ if "/ig/images/weather/" in forecast_icon:
+ self.icons.append(forecast_icon.split("/ig/images/weather/")[-1].split(".gif")[0])
+ elif "http://g0.gstatic.com/images/icons/onebox"; in forecast_icon:
+ self.icons.append(forecast_icon.split("http://g0.gstatic.com/images/icons/onebox/weather_";)[-1].split("-40.gif")[0])
+ self.conditions.append(forecast["condition"])
+ self.error_message = None
+
+ except urllib2.URLError:
+ log.error("Forecast: error reading forecast for %s" % location_name)
+ except KeyError:
+ log.error("Forecast: returned empty forecast %s" % location_name)
+ self.error_message = _('Unknown error occurred while picking up weather data')
+
+ # Parse high values for forecast data
+ def get_forecast_data(self):
+ self.highdata = []
+ self.lowdata = []
+
+ if not hasattr(self, 'unitsystem'):
+ return None
+
+ if ((self.unitsystem == 'SI') and (self.metric_system == MetricSystem.SI)) or ((self.unitsystem == 'US') and (self.metric_system == MetricSystem.IMPERIAL)):
+ #correct scale selected
+ for forecast in self.forecast['forecasts']:
+ self.highdata.append(forecast["high"])
+ self.lowdata.append(forecast["low"])
+
+ elif ((self.unitsystem == 'SI') and (self.metric_system == MetricSystem.IMPERIAL)):
+ #convert from SI to imperial
+ for forecast in self.forecast['forecasts']:
+ self.highdata.append(int(((int(forecast["high"])*9)/5)+32))
+ self.lowdata.append(int(((int(forecast["low"])*9)/5)+32))
+
+ elif ((self.unitsystem == 'US') and (self.metric_system == MetricSystem.SI)):
+ #convert from imperial to SI
+ for forecast in self.forecast['forecasts']:
+ self.highdata.append(int((((int(forecast["high"]))-32)*5)/9))
+ self.lowdata.append(int((((int(forecast["low"]))-32)*5)/9))
+
+ return (self.highdata, self.lowdata)
+
+ # Parse a list of days of week with forecast data
+ def get_forecast_daysofweek(self):
+ return self.daysofweek
+
+ # Parse icons for forecast data
+ def get_forecast_icons(self):
+ return self.icons
+
+ # Parse conditions for forecast data
+ def get_forecast_conditions(self):
+ return self.conditions
+
+class Weather:
+ """
+ Data object to parse weather data with unit convertion
+ """
+
+ #Available conditions by google icon
+ #Format: Google icon name: (day icon, night icon, is a severe weather condition)
+ #Reference: http://www.blindmotion.com/2009/03/google-weather-api-images/
+ _GoogleConditions = {
+ "sunny" : ( "weather-clear", "weather-clear-night", False),
+ "mostly_sunny" : ( "weather-clear", "weather-clear-night", False),
+ "partlycloudy" : ( "weather-few-clouds", "weather-few-clouds-night", False),
+ "partly_cloudy" : ( "weather-few-clouds", "weather-few-clouds-night", False),
+ "windy" : ( "weather-few-clouds", "weather-few-clouds-night", False),
+ "cloudy" : ( "weather-clouds", "weather-clouds-night", False),
+ "mostlycloudy" : ( "weather-overcast", "weather-overcast", False),
+ "mostly_cloudy" : ( "weather-overcast", "weather-overcast", False),
+ "overcast" : ( "weather-overcast", "weather-overcast", False),
+ "rain" : ( "weather-showers", "weather-showers", False),
+ "chanceofrain" : ( "weather-showers", "weather-showers", False),
+ "chance_of_rain" : ( "weather-showers", "weather-showers", False),
+ "heavyrain" : ( "weather-showers", "weather-showers", False),
+ "drizzle" : ( "weather-showers", "weather-showers", False),
+ "sleet" : ( "weather-snow", "weather-snow", False),
+ "rain_snow" : ( "weather-snow", "weather-snow", False),
+ "rainsnow" : ( "weather-snow", "weather-snow", False),
+ "snow" : ( "weather-snow", "weather-snow", False),
+ "chanceofsnow" : ( "weather-snow", "weather-snow", False),
+ "chance_of_snow" : ( "weather-snow", "weather-snow", False),
+ "heavysnow" : ( "weather-snow", "weather-snow", False),
+ "icy" : ( "weather-snow", "weather-snow", False),
+ "snowflurries" : ( "weather-snow", "weather-snow", False),
+ "flurries" : ( "weather-snow", "weather-snow", False),
+ "dust" : ( "weather-fog", "weather-fog", False),
+ "fog" : ( "weather-fog", "weather-fog", False),
+ "smoke" : ( "weather-fog", "weather-fog", False),
+ "haze" : ( "weather-fog", "weather-fog", False),
+ "mist" : ( "weather-fog", "weather-fog", False),
+ "thunderstorm" : ( "weather-storm", "weather-storm", True),
+ "chance_of_storm" : ( "weather-storm", "weather-storm", True),
+ "thunderstorms" : ( "weather-storm", "weather-storm", True),
+ "scatteredshowers" : ( "weather-showers-scattered", "weather-showers-scattered", True),
+ "scatteredthunderstorms" : ( "weather-storm", "weather-storm", True),
+ }
+
+ #Available conditions by yahoo condition code
+ #Format: condition code: (day icon, night icon, is a severe weather condition, localized condition name)
+ _YahooConditions = {
+ '0' : ("weather-storm", "weather-storm", True, _("Tornado")),
+ '1' : ("weather-storm", "weather-storm", True, _("Tropical storm")),
+ '2' : ("weather-storm", "weather-storm", True, _("Hurricane")),
+ '3' : ("weather-storm", "weather-storm", True, _("Severe thunderstorms")),
+ '4' : ("weather-storm", "weather-storm", True, _("Thunderstorms")),
+ '5' : ("weather-snow", "weather-snow", False, _("Mixed rain and snow")),
+ # Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+ '6' : ("weather-showers", "weather-showers", False, _("Mixed rain and sleet")),
+ '7' : ("weather-snow", "weather-snow", False, _("Mixed snow and sleet")),
+ '8' : ("weather-showers", "weather-showers", False, _("Freezing drizzle")),
+ '9' : ("weather-showers", "weather-showers", False, _("Drizzle")),
+ '10': ("weather-snow", "weather-snow", False, _("Freezing rain")),
+ '11': ("weather-showers", "weather-showers", False, _("Showers")),
+ '12': ("weather-showers", "weather-showers", False, _("Showers")),
+ '13': ("weather-snow", "weather-snow", False, _("Snow flurries")),
+ '14': ("weather-snow", "weather-snow", False, _("Light snow showers")),
+ '15': ("weather-snow", "weather-snow", False, _("Blowing snow")),
+ '16': ("weather-snow", "weather-snow", False, _("Snow")),
+ '17': ("weather-showers", "weather-showers", False, _("Hail")),
+ '18': ("weather-snow", "weather-snow", False, _("Sleet")),
+ '19': ("weather-fog", "weather-fog", False, _("Dust")),
+ '20': ("weather-fog", "weather-fog", False, _("Foggy")),
+ '21': ("weather-fog", "weather-fog", False, _("Haze")),
+ '22': ("weather-fog", "weather-fog", False, _("Smoky")),
+ '23': ("weather-clear", "weather-clear-night", False, _("Blustery")),
+ '24': ("weather-clear", "weather-clear-night", False, _("Windy")),
+ '25': ("weather-clear", "weather-clear-night", False, _("Cold")),
+ '26': ("weather-clouds", "weather-clouds-night", False, _("Cloudy")),
+ '27': ("weather-clouds", "weather-clouds-night", False, _("Mostly cloudy")),
+ '28': ("weather-clouds", "weather-clouds-night", False, _("Mostly cloudy")),
+ '29': ("weather-few-clouds", "weather-few-clouds-night", False, _("Partly cloudy")),
+ '30': ("weather-few-clouds", "weather-few-clouds-night", False, _("Partly cloudy")),
+ '31': ("weather-clear", "weather-clear-night", False, _("Clear")),
+ '32': ("weather-clear", "weather-clear-night", False, _("Sunny")),
+ '33': ("weather-clear", "weather-clear-night", False, _("Fair")),
+ '34': ("weather-clear", "weather-clear-night", False, _("Fair")),
+ '35': ("weather-showers-scattered", "weather-showers-scattered",False, _("Mixed rain and hail")),
+ '36': ("weather-clear", "weather-clear-night", False, _("Hot")),
+ '37': ("weather-storm", "weather-storm", True, _("Isolated thunderstorms")),
+ '38': ("weather-storm", "weather-storm", True, _("Scattered thunderstorms")),
+ '39': ("weather-storm", "weather-storm", True, _("Scattered thunderstorms")),
+ '40': ("weather-showers-scattered", "weather-showers-scattered",False, _("Scattered showers")),
+ '41': ("weather-snow", "weather-snow", False, _("Heavy snow")),
+ '42': ("weather-snow", "weather-snow", False, _("Scattered snow showers")),
+ '43': ("weather-snow", "weather-snow", False, _("Heavy snow")),
+ '44': ("weather-few-clouds", "weather-few-clouds-night", False, _("Partly cloudy")),
+ '45': ("weather-storm", "weather-storm", True, _("Thundershowers")),
+ '46': ("weather-snow", "weather-snow", False, _("Snow showers")),
+ '47': ("weather-storm", "weather-storm", True, _("Isolated thundershowers")),
+ '3200': (False, False, False, _("Unknown condition"))
+ }
+
+ # Initialize and get fresh data
+ def __init__(self, location_id, weather_datasource, metric_system, wind_unit, lat, lon):
+ self.__weather_datasource = weather_datasource
+ self.__metric_system = metric_system
+ self._wind_unit = wind_unit
+ self.__current_condition = None
+ self.__lat = lat
+ self.__lon = lon
+
+ # Get data from Google
+ if self.__weather_datasource == WeatherDataSource.GOOGLE:
+ # Get data in english locale, then - switch back
+ self.__report = pywapi.get_weather_from_google (location_id, hl = 'en')
+ # Get data in original locale for condition name
+ self.__localized_report = pywapi.get_weather_from_google (location_id, hl = locale_name)
+
+ if 'current_conditions' not in self.__report.keys():
+ log.error("Weather: could not get Google weather condition from report")
+ log.error("Weather: got data '%s'" % str(self.__report))
+ self.__current_condition = (False, False, False, _("Unknown condition"))
+
+ if 'current_conditions' not in self.__localized_report.keys():
+ log.error("Weather: could not get Google weather condition from localized report")
+ log.error("Weather: got data '%s'" % str(self.__localized_report))
+ self.__current_condition = (False, False, False, _("Unknown condition"))
+
+ if 'icon' in self.__report['current_conditions'].keys():
+ icon_path = self.__report['current_conditions']['icon']
+ if '/ig/images/weather/' in icon_path:
+ icon_name = icon_path.replace('/ig/images/weather/', '').replace('.gif', '')
+ elif 'http://g0.gstatic.com/images/icons/onebox' in icon_path:
+ icon_name = icon_path.replace('http://g0.gstatic.com/images/icons/onebox/weather_', '').replace('-40.gif', '')
+ else:
+ icon_name = icon_path
+ else:
+ log.error("Weather: could not get weather icon from report")
+ log.error("Weather: got data '%s'" % str(self.__report['current_conditions']))
+ icon_name = ""
+
+ self.__current_condition = self._GoogleConditions.get(icon_name)
+ if self.__current_condition == None:
+ log.error("ExtendedForecast: unknown Google weather condition '%s'" % icon_name)
+ self.__current_condition = (False, False, False, _("Unknown condition"))
+
+ # Get data from Yahoo
+ if self.__weather_datasource == WeatherDataSource.YAHOO:
+ self.__report = pywapi.get_weather_from_yahoo (location_id, 'imperial')
+ self.__localized_report = self.__report
+ if 'condition' not in self.__report.keys():
+ log.error("Weather: could not get Yahoo weather condition from report")
+ log.error("Weather: got data '%s'" % str(self.__report))
+ self.__current_condition = (False, False, False, _("Unknown condition"))
+
+ elif 'code' in self.__report['condition'].keys():
+ icon_name = self.__report['condition']['code']
+ self.__current_condition = self._YahooConditions.get(icon_name)
+
+ else:
+ icon_name = ""
+ log.error("Weather: could not get icon name from Yahoo report")
+ log.error("Weather: got data '%s'" % str(self.__report['condition']))
+ self.__current_condition = (False, False, False, _("Unknown condition"))
+
+ log.debug("Weather: current condition: '%s', '%s'" % (icon_name, str(self.__current_condition)))
+ #Prepare sunrise/sunset data
+ self.get_sun_data()
+
+ #Get sunrise/sunset times, calculate whether it is night already
+ def get_sun_data(self):
+ self.__night = False
+ self.__sunrise_t = None
+ self.__sunset_t = None
+ # Grab local datetime and the daylight saving status (1/0)
+ # from earthtools.org
+ url = 'http://www.earthtools.org/timezone-1.1/%s/%s' % \
+ (self.__lat, self.__lon)
+ try:
+ f = urllib2.urlopen(url)
+ s = f.read()
+ parsed = parseString(s)
+ localtime = parsed.getElementsByTagName(
+ "isotime")[0].firstChild.nodeValue
+ dst = parsed.getElementsByTagName(
+ "dst")[0].firstChild.nodeValue
+ # strip timezone info
+ localtime = datetime.datetime.strptime(localtime.rsplit(' ',1)[0],
+ '%Y-%m-%d %H:%M:%S')
+ dst = 1 if dst == "True" else 0
+
+ except urllib2.URLError:
+ log.error("Weather: error reaching url '%s'" % url)
+ return
+
+ # Grab sunrise/sunset from earthtools.org
+ url = 'http://www.earthtools.org/sun/%s/%s/%s/%s/99/%s' % \
+ (self.__lat, self.__lon, localtime.day, localtime.month, dst)
+ try:
+ f = urllib2.urlopen(url)
+ s=f.read()
+ parsed = parseString(s)
+ sunrise = parsed.getElementsByTagName("morning")[0].getElementsByTagName("sunrise")[0].firstChild.nodeValue
+ sunset = parsed.getElementsByTagName("evening")[0].getElementsByTagName("sunset")[0].firstChild.nodeValue
+ self.__sunrise_t = datetime.datetime.strptime(sunrise, '%H:%M:%S').time()
+ self.__sunset_t = datetime.datetime.strptime(sunset, '%H:%M:%S').time()
+ except urllib2.URLError:
+ log.error("Weather: error reaching url '%s'" % url)
+ return
+
+ # Calculate, whether it is night or day
+ if localtime.time()<self.__sunrise_t or localtime.time()>self.__sunset_t:
+ self.__night = True
+ else:
+ self.__night = False
+ log.debug("Weather: got localtime " +
+ "%s, dst %s, sunrise '%s', sunset '%s', night = %s" % (
+ localtime, dst, self.__sunrise_t, self.__sunset_t, self.__night))
+
+ # Return True, if weather condition is severe
+ def condition_is_severe(self):
+ if self.__current_condition != None:
+ log.debug("Weather: got severe condition '%s'" % self.__current_condition[2])
+ return self.__current_condition[2]
+ else:
+ log.error("Weather: condition is not set while condition severity check")
+ return False;
+
+ # Get associated icon name
+ def get_icon_name(self):
+ if self.__current_condition != None:
+ if self.__night:
+ log.debug("Weather: night, show '%s' icon" % self.__current_condition[1])
+ return self.__current_condition[1]
+ else:
+ log.debug("Weather: day, show '%s' icon" % self.__current_condition[0])
+ return self.__current_condition[0]
+ else:
+ log.error("Weather: return 'offline' icon due to empty condition")
+ return False
+
+ # Get condition text
+ def get_condition_label(self):
+ if self.__weather_datasource == WeatherDataSource.GOOGLE:
+ if 'condition' in self.__localized_report['current_conditions'].keys():
+ condition = self.__localized_report['current_conditions']['condition']
+ else:
+ condition = _("Unknown condition")
+ if self.__weather_datasource == WeatherDataSource.YAHOO:
+ condition = self.__current_condition[3]
+ return condition
+
+ # Get humidity label
+ def get_humidity_label(self):
+ humidity = "%s: ---%%" % (_("Humidity"))
+ if self.__weather_datasource == WeatherDataSource.GOOGLE \
+ and 'humidity' in self.__localized_report['current_conditions']:
+ humidity = self.__localized_report['current_conditions']['humidity']
+ if self.__weather_datasource == WeatherDataSource.YAHOO \
+ and 'humidity' in self.__localized_report['atmosphere']:
+ humidity = "%s: %s%%" % (_("Humidity"), self.__localized_report['atmosphere']['humidity'])
+ return humidity
+
+ # Get dew point - using in humidex calculation
+ #TODO: Update with NOAA
+ def get_dew_point_label(self):
+ if self.__weather_datasource == WeatherDataSource.GOOGLE or self.__weather_datasource == WeatherDataSource.YAHOO:
+ # Not returned by Google and Yahoo
+ return None
+
+ # Get pressure label
+ def get_pressure_label(self):
+ if self.__weather_datasource == WeatherDataSource.GOOGLE:
+ # TODO: Empty for Google, use NOAA data?
+ value = "---"
+ unit = ""
+ if self.__weather_datasource == WeatherDataSource.YAHOO \
+ and 'pressure' in self.__localized_report['atmosphere'].keys() \
+ and 'pressure' in self.__localized_report['units'].keys():
+ value = self.__localized_report['atmosphere']['pressure']
+ unit = self.__localized_report['units']['pressure']
+ return "%s: %s %s" % (_("Pressure"), value, units)
+
+ # Get temperature with units value - doesn't include 'Temperature' label
+ def get_temperature(self, needs_rounding = False):
+ _value = "---"
+ _unit = ""
+ if self.__weather_datasource == WeatherDataSource.GOOGLE:
+ if (self.__metric_system == MetricSystem.SI) \
+ and 'temp_c' in self.__report['current_conditions'].keys():
+ _value = self.__report['current_conditions']['temp_c']
+ _unit = "˚C"
+ elif 'temp_f' in self.__report['current_conditions'].keys():
+ _value = self.__report['current_conditions']['temp_f']
+ _unit = "˚F"
+ if self.__weather_datasource == WeatherDataSource.YAHOO:
+ if (self.__metric_system == MetricSystem.SI) \
+ and 'temp' in self.__report['condition'].keys():
+ _value = NumberFormatter.format_float(
+ ((float(self.__report['condition']['temp']) - 32) * 5/9), 1)
+ _unit = "˚C"
+ else:
+ _value = self.__report['condition']['temp']
+ _unit = "˚F"
+ # round the value if required
+ if needs_rounding and _value != "---":
+ _value = NumberFormatter.format_float(locale.atof(_value), 0)
+ return ("%s %s" % (_value, _unit))
+
+ # Get temperature label
+ def get_temperature_label(self):
+ return "%s: %s" % (_("Temperature"), self.get_temperature())
+
+ # Get humidex parameter
+ def get_humidex_label(self):
+ if self.__weather_datasource == WeatherDataSource.GOOGLE or self.__weather_datasource == WeatherDataSource.YAHOO:
+ #Empty for Yahoo and Google
+ return None
+ #TODO: Update with NOAA data
+ #dewPoint=2
+ #temp_c = 1
+ #self.vapour_pressure = 6.11 * math.exp(5417.7530 * ( (1/273.16) - (1/(dewPoint+273.16))))
+ #self.humidex = temp_c + (0.5555)*(self.vapour_pressure - 10.0);
+ #return ("%s: %.1f" % (_("Humidex"), self.humidex)).replace(".0", "")
+
+ # Get wind label
+ def get_wind_label(self):
+ if self.__weather_datasource == WeatherDataSource.GOOGLE:
+ # Convert units picked up from Google and replace units with currently configured
+ if 'wind_condition' in self.__localized_report['current_conditions'].keys():
+ localized_wind_info = self.__localized_report['current_conditions']['wind_condition'].split(' ')
+ wind_direction = localized_wind_info[1]
+ wind_info = self.__report['current_conditions']['wind_condition'].split(' ')
+ wind_speed = wind_info[3]
+ else:
+ return _("Unknown")
+
+ if self.__weather_datasource == WeatherDataSource.YAHOO:
+ # Create a similar to Google wind_info structure from Yahoo data
+ wind_direction = "%s (%s˚)" % (self.get_wind_direction(self.__localized_report['wind']['direction']), self.__localized_report['wind']['direction'])
+ wind_speed = self.__localized_report['wind']['speed']
+ wind_units = self.__localized_report['units']['speed']
+ localized_wind_info = [_("Wind") + ":", wind_direction, wind_speed, wind_units]
+
+
+ try:
+ _value = float(wind_speed)
+ except ValueError as e:
+ log.error("Could not parse '%s' as wind speed." % str(wind_speed))
+ _value = -1.0
+
+ # Parse Wind_direction - convert to selected scale
+ if (self._wind_unit == WindUnits.MPH):
+ _unit = __("mph", "mph", _value)
+ if (self._wind_unit == WindUnits.MPS):
+ _value *= 0.44704
+ _unit = __("m/s", "m/s", _value)
+ if (self._wind_unit == WindUnits.BEAUFORT):
+ if _value >= 0.0:
+ _value = self.get_beaufort_from_mph(_value)
+ _unit = ""
+ if (self._wind_unit == WindUnits.KPH):
+ _value *= 1.609344
+ _unit = __("km/h", "km/h", _value)
+ if (self._wind_unit == WindUnits.KNOTS):
+ _value *= 0.868976241900648
+ _unit = __("knot", "knots", _value)
+
+ # Join wind_info data in a label
+ localized_wind_info[len(localized_wind_info)-1] = _unit
+ localized_wind_info[len(localized_wind_info)-2] = \
+ NumberFormatter.format_float(_value, 1)
+ if _value < 0.0:
+ localized_wind_info[1:] = ["", "N\A", ""]
+ return "%s %s %s %s" % (localized_wind_info[0], localized_wind_info[1], \
+ localized_wind_info[2], localized_wind_info[3])
+
+ # Get sunrise label
+ def get_sunrise_label(self):
+ return "%s: %s" % (_("Sunrise"), TimeFormatter.format_time(self.__sunrise_t))
+
+ # Get sunset label
+ def get_sunset_label(self):
+ return "%s: %s" % (_("Sunset"), TimeFormatter.format_time(self.__sunset_t))
+
+
+ # Additional functions
+ # Convert wind direction from degrees to localized direction
+ def get_wind_direction(self, degrees):
+ try:
+ degrees = int(degrees)
+ except ValueError:
+ return ''
+
+ if degrees < 23 or degrees >= 338:
+ #Short wind direction - north
+ return _('N')
+ elif degrees < 68:
+ return _('NE')
+ elif degrees < 113:
+ return _('E')
+ elif degrees < 158:
+ return _('SE')
+ elif degrees < 203:
+ return _('S')
+ elif degrees < 248:
+ return _('SW')
+ elif degrees < 293:
+ return _('W')
+ elif degrees < 338:
+ return _('NW')
+
+ # Convert mph to Beufort scale
+ def get_beaufort_from_mph(self, value):
+ if value < 1:
+ return 0
+ elif value < 4:
+ return 1
+ elif value < 8:
+ return 2
+ elif value < 13:
+ return 3
+ elif value < 18:
+ return 4
+ elif value < 25:
+ return 5
+ elif value < 27:
+ return 6
+ elif value < 39:
+ return 7
+ elif value < 47:
+ return 8
+ elif value < 89:
+ return 9
+ elif value < 64:
+ return 10
+ elif value < 73:
+ return 11
+ elif value >= 73:
+ return 12
+
+class indicator_weather(threading.Thread):
+ """ Indicator class """
+ last_update_time = None
+
+ # Settings values
+ # Formats: setting value, object name (for preferences dialog), value assigned (optional)
+ metric_systems = { 'S': ('si', MetricSystem.SI),
+ 'I': ('imperial', MetricSystem.IMPERIAL)}
+
+ weather_sources = { 'G': ('google', WeatherDataSource.GOOGLE),
+ 'Y': ('yahoo', WeatherDataSource.YAHOO)}
+
+ notifications = {'N': 'nonotif',
+ 'O': 'notifsevere',
+ 'A': 'notifall'}
+
+ wind_systems = {'mps': ("mps", WindUnits.MPS),
+ 'mph': ("mph", WindUnits.MPH),
+ 'kph': ("kph", WindUnits.KPH),
+ 'beaufort': ("beaufort", WindUnits.BEAUFORT),
+ 'knots': ("knots", WindUnits.KNOTS)}
+
+ # Initializing and reading settings
+ def __init__(self):
+ log.debug("Indicator: creating")
+ threading.Thread.__init__(self)
+ self.main_icon = os.path.join
+ self.winder = appindicator.Indicator ("indicator-weather", "weather-indicator", appindicator.CATEGORY_OTHER)
+ self.winder.set_status (appindicator.STATUS_ACTIVE)
+ self.winder.set_attention_icon ("weather-indicator-error")
+
+ self.menu_update_lock = threading.Lock()
+ self.refreshed_minutes_ago = -1
+ monitor_upower(self.on_system_sleep, self.on_system_resume, log)
+
+ log.debug("Indicator: reading settings")
+ self.settings = Settings()
+ self.settings.check_autostart()
+ self.settings.prepare_settings_store()
+ self.rate = self.settings.get_value("refresh_rate")
+ self.unit = self.settings.get_value("unit")
+ self.notif = self.settings.get_value("notif")
+ self.wind = self.settings.get_value("wind")
+ self.source = self.settings.get_value("data_source")
+ self.placechosen = self.settings.get_value("placechosen")
+ self.places = str(self.settings.get_value("places"))
+ self.show_label = self.settings.get_value("show_label")
+
+ log.debug("Preferences: got settings: rate=%s, unit=%s, notif=%s, wind=%s, placechosen=%s, places=%s" %
+ (self.rate, self.unit, self.notif, self.wind, self.placechosen, self.places))
+
+ #Setting default values
+ self.metric_system = MetricSystem.SI
+ self.wind_unit = WindUnits.MPH
+ self.place = None
+ self.menu = None
+ self.condition = None
+ self.icon = None
+
+ #Parsing settings
+ # Metric system
+ if self.unit in (False, None):
+ default_value = 'S'
+ log.debug("Indicator: could not parse unit, setting to %s" % default_value)
+ self.settings.set_value("unit", default_value)
+ self.unit = default_value
+ self.metric_system = self.metric_systems[self.unit][1]
+
+ # Notification
+ if self.notif in (False, None):
+ default_value = 'N'
+ log.debug("Indicator: could not parse notif, setting to %s" % default_value)
+ self.settings.set_value("notif", default_value)
+ self.notif = default_value
+
+ # Wind units
+ if self.wind in (False, None):
+ default_value = 'mph'
+ log.debug("Indicator: could not parse wind, setting to %s" % default_value)
+ self.settings.set_value("wind", default_value)
+ self.wind = default_value
+ self.wind_unit = self.wind_systems[self.wind][1]
+
+ # Show label in indicator?
+ self.show_label = True if self.show_label == 1 else False
+
+ # Weather source
+ if self.source in (False, None):
+ default_value = 'Y'
+ log.debug("Indicator: could not parse data source, setting to %s" % default_value)
+ self.settings.set_value("data_source", default_value)
+ self.source = default_value
+ self.weather_source = self.weather_sources[self.source][1]
+
+ # Rate
+ if self.rate in (False, None):
+ default_value = 15
+ log.debug("Indicator: could not parse rate, setting to %s" % str(default_value))
+ self.settings.set_value("refresh_rate", default_value)
+ self.rate = default_value
+
+ # Place chosen
+ if self.placechosen == None:
+ log.debug("Indicator: could not parse placechosen, setting to 0")
+ self.settings.set_value("placechosen", 0)
+ self.placechosen = 0
+ else:
+ self.placechosen = int(self.placechosen)
+
+ # Places list
+ if self.places in (False, None, '', '[]', "['']"):
+ log.debug("Indicator: could not parse places")
+ self.menu_noplace()
+ else:
+ self.places = eval(self.places)
+ if self.placechosen >= len(self.places):
+ self.placechosen = 0
+ self.place = self.places[self.placechosen]
+ self.location_details = self.settings.get_location_details(self.place[0])
+ if self.location_details in (False, None, '', '[]', "['']"):
+ log.debug("Indicator: could not parse current location details")
+ self.menu_noplace()
+ else:
+ self.location_details = eval(self.location_details)
+ self.menu_normal()
+ self.update_weather()
+
+ # Set a label of indicator
+ def update_label(self, label):
+ if (hasattr(self.winder, 'set_label')):
+ log.debug("Indicator: update_label: setting label to '%s'" % label)
+ self.previous_label_value = label
+ self.winder.set_label(label) if self.show_label else self.winder.set_label(" ")
+ self.winder.set_status(appindicator.STATUS_ATTENTION)
+ self.winder.set_status(appindicator.STATUS_ACTIVE)
+
+ # Show a menu if no places specified
+ def menu_noplace(self):
+ log.debug("Indicator: making a menu for no places")
+ menu_noplace = gtk.Menu()
+
+ setup = gtk.MenuItem(_("Set Up Weather..."))
+ setup.connect("activate", self.prefs)
+ setup.show()
+ menu_noplace.append(setup)
+
+ quit = gtk.ImageMenuItem(gtk.STOCK_QUIT)
+ quit.connect("activate", self.quit)
+ quit.show()
+ menu_noplace.append(quit)
+
+ self.winder.set_menu(menu_noplace)
+ self.winder.set_icon(os.path.join(PROJECT_ROOT_DIRECTORY, "share/indicator-weather/media/icon.png"))
+ self.winder.set_status(appindicator.STATUS_ATTENTION)
+ self.winder.set_status(appindicator.STATUS_ACTIVE)
+
+ # Show menu with data
+ def menu_normal(self):
+ log.debug("Indicator: menu_normal: filling in a menu for found places")
+ self.menu = gtk.Menu()
+
+ ##City
+ self.city_show = gtk.MenuItem()
+ self.city_show.set_sensitive(True)
+ self.menu.append(self.city_show)
+ self.city_show.show()
+
+ ##Condition
+ self.cond_show = gtk.MenuItem()
+ self.cond_show.set_sensitive(True)
+ self.cond_show.show()
+ self.menu.append(self.cond_show)
+
+ ##Temperature
+ self.temp_show = gtk.MenuItem()
+ self.temp_show.set_sensitive(True)
+ self.temp_show.show()
+ self.menu.append(self.temp_show)
+
+ ##Humidex
+ self.humidex_show = gtk.MenuItem()
+ self.humidex_show.set_sensitive(True)
+ self.humidex_show.show()
+ self.menu.append(self.humidex_show)
+
+ ##Humidity
+ self.humid_show = gtk.MenuItem()
+ self.humid_show.set_sensitive(True)
+ self.humid_show.show()
+ self.menu.append(self.humid_show)
+
+ ##Wind
+ self.wind_show = gtk.MenuItem()
+ self.wind_show.set_sensitive(True)
+ self.wind_show.show()
+ self.menu.append(self.wind_show)
+
+ ##Sunrise
+ self.sunrise_show = gtk.MenuItem()
+ self.sunrise_show.set_sensitive(True)
+ self.sunrise_show.show()
+ self.menu.append(self.sunrise_show)
+
+ ##Sunset
+ self.sunset_show = gtk.MenuItem()
+ self.sunset_show.set_sensitive(True)
+ self.sunset_show.show()
+ self.menu.append(self.sunset_show)
+
+ ##Cities
+ if len(self.places) != 1:
+ ##Breaker
+ breaker = gtk.SeparatorMenuItem()
+ breaker.show()
+ self.menu.append(breaker)
+
+ log.debug("Indicator: menu_normal: adding first location menu item '%s'" % self.places[0][1])
+ loco1 = gtk.RadioMenuItem(None, self.places[0][1])
+ if self.placechosen == 0:
+ loco1.set_active(True)
+ loco1.connect("toggled", self.on_city_changed)
+ loco1.show()
+ self.menu.append(loco1)
+ for place in self.places[1:]:
+ log.debug("Indicator: menu_normal: adding location menu item '%s'" % place[1])
+ loco = gtk.RadioMenuItem(loco1, place[1])
+ if self.places.index(place) == self.placechosen:
+ loco.set_active(True)
+ loco.connect("toggled", self.on_city_changed)
+ loco.show()
+ self.menu.append(loco)
+
+ ##Breaker
+ breaker = gtk.SeparatorMenuItem()
+ breaker.show()
+ self.menu.append(breaker)
+
+ self.refresh_show = gtk.MenuItem()
+ #label will be set later
+ self.refresh_show.connect("activate", self.update_weather)
+ self.refresh_show.show()
+ self.menu.append(self.refresh_show)
+
+ ext_show = gtk.MenuItem(_("Forecast"))
+ ext_show.connect("activate", self.extforecast)
+ ext_show.show()
+ self.menu.append(ext_show)
+
+ ##Preferences
+ prefs_show = gtk.MenuItem(_("Preferences..."))
+ prefs_show.connect("activate", self.prefs)
+ prefs_show.show()
+ self.menu.append(prefs_show)
+
+ ##About
+ about_show = gtk.MenuItem(_("About..."))
+ about_show.connect("activate", self.about)
+ about_show.show()
+ self.menu.append(about_show)
+
+ ##Quit
+ quit = gtk.ImageMenuItem(gtk.STOCK_QUIT)
+ quit.connect("activate", self.quit)
+ quit.show()
+ self.menu.append(quit)
+
+ self.winder.set_menu(self.menu)
+ self.update_label(" ")
+
+ # Another city has been selected from radiobutton
+ def on_city_changed(self,widget):
+ if widget.get_active():
+ for place in self.places:
+ if (place[1] == widget.get_label()):
+ log.debug("Indicator: new location selected: %s" % self.places.index(place))
+ self.placechosen = self.places.index(place)
+ break
+
+ if self.placechosen >= len(self.places):
+ self.placechosen = 0
+ self.place = self.places[self.placechosen]
+ self.location_details = self.settings.get_location_details(self.place[0])
+ if self.location_details in (False, None, '', '[]', "['']"):
+ log.debug("Indicator: could not parse location details for placechosen='%s'" % self.placechosen)
+ self.menu_noplace()
+ else:
+ self.location_details = eval(self.location_details)
+ self.settings.set_value("placechosen", self.placechosen)
+ self.update_weather(False)
+
+ def on_system_sleep(self):
+ """
+ Callback from UPower that system suspends/hibernates
+ """
+ # store time
+ self.sleep_time = datetime.datetime.now()
+ log.debug("Indicator: system goes to sleep at %s" % self.sleep_time)
+ # remove gobject timeouts
+ if hasattr(self, "refresh_id"):
+ gobject.source_remove(self.refresh_id)
+ if hasattr(self, "rate_id"):
+ gobject.source_remove(self.rate_id)
+
+ def on_system_resume(self):
+ """
+ Callback from UPower that system resumes
+ """
+ now = datetime.datetime.now()
+ log.debug("Indicator: system resumes at %s" % now)
+ # if we have places set
+ if isinstance(self.places, types.ListType) and len(self.places)>0:
+ td = now - self.sleep_time
+ mins_elapsed = td.days/24*60 + td.seconds/60
+ # update refresh label
+ if self.refreshed_minutes_ago >= 0:
+ mins_elapsed += self.refreshed_minutes_ago
+ self.update_refresh_label(mins_elapsed)
+ # check if we need to update the weather now or to reschedule the update
+ min_diff = int(self.rate) - mins_elapsed
+ if min_diff > 0:
+ self.schedule_weather_update(min_diff)
+ else:
+ self.update_weather()
+
+ # Schedule weather update
+ def schedule_weather_update(self, rate_override = None):
+ if hasattr(self, "rate_id"):
+ gobject.source_remove(self.rate_id)
+ if rate_override:
+ self.rate_id = gobject.timeout_add(
+ int(rate_override) * 60000, self.update_weather)
+ else:
+ self.rate_id = gobject.timeout_add(
+ int(self.rate) * 60000, self.update_weather)
+
+ # Schedule weather update
+ def schedule_refresh_label_update(self):
+ if hasattr(self, "refresh_id"):
+ gobject.source_remove(self.refresh_id)
+ self.refresh_id = gobject.timeout_add(60000, self.update_refresh_label)
+
+ # Update 'Refresh' label with time since last successful data refresh
+ def update_refresh_label(self, reset_minutes = None):
+ if reset_minutes is not None:
+ self.refreshed_minutes_ago = reset_minutes
+ else:
+ self.refreshed_minutes_ago += 1
+ self.set_refresh_label()
+ self.schedule_refresh_label_update()
+ return False
+
+ def set_refresh_label(self, refreshing=False):
+ if refreshing:
+ refresh_label=_("Refreshing, please wait")
+ elif self.refreshed_minutes_ago < 0:
+ refresh_label=_("Refresh")
+ elif self.refreshed_minutes_ago == 0:
+ refresh_label="%s (%s)" % (_("Refresh"), _("just now"))
+ else:
+ refresh_label = "%s (%s)" % (_("Refresh"), _("%d min. ago") % self.refreshed_minutes_ago)
+ self.refresh_show.set_label(refresh_label)
+
+ # Load weather data from cache and display its values
+ def show_cached_weather(self):
+ try:
+ self.menu_update_lock.acquire(True)
+ self.previous_condition = None
+ cached_weather = self.settings.get_weather(self.places[self.placechosen][0])
+ if cached_weather is not None:
+ cached_weather = eval(cached_weather)
+ log.debug("Indicator: loading weather from cache for %s" % self.places[self.placechosen])
+ self.menu_normal()
+ self.set_refresh_label(True)
+ self.icon = cached_weather['icon']
+ if (self.icon == False):
+ self.winder.set_icon(os.path.join(PROJECT_ROOT_DIRECTORY, "share/indicator-weather/media/icon_unknown_condition.png"))
+ else:
+ self.winder.set_icon(self.icon)
+
+ self.city_show.set_label(self.places[self.placechosen][1])
+ self.previous_condition = cached_weather['condition']
+ self.cond_show.set_label(cached_weather['condition'])
+ self.temp_show.set_label(cached_weather['temper'])
+ if cached_weather['humidex'] != None:
+ self.humidex_show.set_label(cached_weather['humidex'])
+ else:
+ self.humidex_show.destroy()
+ self.humid_show.set_label(cached_weather['humidity'])
+ self.wind_show.set_label(cached_weather['wind'])
+ self.sunrise_show.set_label(cached_weather['sunrise'])
+ self.sunset_show.set_label(cached_weather['sunset'])
+ self.update_label(cached_weather['label'])
+ self.winder.set_status(appindicator.STATUS_ATTENTION)
+ self.winder.set_status(appindicator.STATUS_ACTIVE)
+
+ except Exception, e:
+ log.error(e)
+ log.debug(traceback.format_exc(e))
+
+ self.menu_update_lock.release()
+
+ # Get fresh weather data
+ def get_new_weather_data(self, notif = True):
+
+ # get weather and catch any exception
+ weather = None
+ try:
+ weather = self.get_weather()
+
+ except urllib2.URLError, e:
+ weather = None
+ log.error("Indicator: networking error: %s" % e)
+
+ except Exception, e:
+ weather = None
+ log.error(e)
+ log.debug(traceback.format_exc(e))
+
+ try:
+ # wait until cacher finishes
+ log.debug("Indicator: updateWeather: waiting for 'Cacher' thread to terminate")
+ self.menu_update_lock.acquire(True)
+ self.menu_update_lock.release()
+
+ if weather is None:
+ # remove the "Refreshing" status
+ self.set_refresh_label()
+ # No data returned - leave cached data to be displayed
+ log.error("Indicator: updateWeather: could not get weather, leaving cached data")
+ # Repeat an attempt in one minute
+ self.schedule_weather_update(1)
+ return
+
+ # Fill in menu with data
+ log.debug("Indicator: updateWeather: got condition '%s', icon '%s'" % (self.condition, self.icon))
+ self.condition = weather.get_condition_label()
+ self.icon = weather.get_icon_name()
+ log.debug("Indicator: fill in menu with params: city='%s', temp='%s', humid='%s', wind='%s', sunrise='%s', sunset='%s', puretemp=%s" % (self.places[self.placechosen][1], weather.get_temperature_label(), weather.get_humidity_label(), weather.get_wind_label(), weather.get_sunrise_label(), weather.get_sunset_label(), weather.get_temperature()))
+
+ self.menu_normal()
+ self.update_refresh_label(0)
+ self.city_show.set_label(self.places[self.placechosen][1])
+ self.cond_show.set_label(self.condition)
+ self.temp_show.set_label(weather.get_temperature_label())
+ if (weather.get_humidex_label() != None):
+ self.humidex_show.set_label(weather.get_humidex_label())
+ else:
+ self.humidex_show.destroy()
+ self.humid_show.set_label(weather.get_humidity_label())
+ self.wind_show.set_label(weather.get_wind_label())
+ self.sunrise_show.set_label(weather.get_sunrise_label())
+ self.sunset_show.set_label(weather.get_sunset_label())
+
+ # Saving cached data, unless correct icon is supplied
+ if (self.icon == False):
+ self.winder.set_icon(os.path.join(PROJECT_ROOT_DIRECTORY, "share/indicator-weather/media/icon_unknown_condition.png"))
+ else:
+ self.winder.set_icon(self.icon)
+ self.settings.save_weather(weather, self.places[self.placechosen][0])
+ self.update_label(weather.get_temperature(needs_rounding=True))
+
+ # Notify user, if notifications are enabled
+ if self.condition != self.previous_condition and self.notif == 'U':
+ # Weather condition has changed
+ log.debug("Indicator: updateWeather: weather has changed, notify")
+ self.notify(self.condition, self.icon)
+ if self.notif == 'S' and weather.condition_is_severe():
+ # Severe weather condition notification
+ log.debug("Indicator: updateWeather: severe condition notification")
+ self.notify(self.condition, self.icon, severe=True)
+
+ self.previous_condition = self.condition
+
+ except Exception, e:
+ log.error(e)
+ log.debug(traceback.format_exc(e))
+
+ self.schedule_weather_update()
+
+ # Update weather
+ def update_weather(self, notif=True, widget=None):
+ log.debug("Indicator: updateWeather: updating weather for %s" % self.places[self.placechosen])
+ # First, display cached data
+ threading.Thread(target=self.show_cached_weather, name='Cache').start()
+ # Then, start a new thread with real data pickup
+ threading.Thread(target=self.get_new_weather_data, name='Fetcher').start()
+
+ # Get current weather for selected location
+ def get_weather(self):
+ log.debug("Indicator: getWeather for location '%s'" % self.location_details['full name'])
+ self.current_location = Location(self.metric_system, self.wind_unit, self.location_details)
+ log.debug("Indicator: getWeather: updating weather report")
+ self.current_location.update_weather_data(self.weather_source)
+ return self.current_location.weather
+
+ # Show notification to user
+ def notify(self,conditon,icon,severe=False):
+ log.debug("Indicator: Notify on weather condition, severe=%s, condition=%s, icon=%s" % (severe, self.condition, icon))
+ if severe:
+ n = pynotify.Notification (_("Severe weather alert"),
+ self.condition,
+ icon)
+ else:
+ n = pynotify.Notification (self.condition, "", icon)
+ n.show ()
+
+ # Menu callbacks
+ # Open Preferences dialog
+ def prefs(self, widget):
+ log.debug("Indicator: open Preferences")
+ if ((not hasattr(self, 'prefswindow')) or (not self.prefswindow.get_visible())):
+ self.prefswindow = PreferencesDialog()
+ self.prefswindow.show()
+
+ def about(self, widget):
+ log.debug("Indicator: open About dialog")
+ self.aboutdialog = gtk.AboutDialog()
+ self.aboutdialog.set_name(_("Weather Indicator"))
+ self.aboutdialog.set_version(VERSION)
+
+ ifile = open(os.path.join(PROJECT_ROOT_DIRECTORY, "share/doc/indicator-weather/AUTHORS"), "r")
+ self.aboutdialog.set_copyright(ifile.read().replace('\x0c', ''))
+ ifile.close()
+
+ ifile = open(os.path.join(PROJECT_ROOT_DIRECTORY, "share/common-licenses/GPL-3"), "r")
+ self.aboutdialog.set_license(ifile.read().replace('\x0c', ''))
+ ifile.close()
+
+ self.aboutdialog.set_website("https://launchpad.net/weather-indicator";)
+ self.aboutdialog.set_translator_credits(_("translator-credits"))
+ logo_path = os.path.join(PROJECT_ROOT_DIRECTORY, "share/indicator-weather/media/icon.png")
+ self.aboutdialog.set_logo(gtk.gdk.pixbuf_new_from_file(logo_path))
+
+
+ self.aboutdialog.connect("response", self.about_close)
+ self.aboutdialog.show()
+
+ def about_close(self, widget, event=None):
+ log.debug("Indicator: closing About dialog")
+ self.aboutdialog.destroy()
+
+ # Open Extended forecast window
+ def extforecast(self, widget):
+ log.debug("Indicator: open Forecast")
+ if ((not hasattr(self, 'forecastwd')) or (not self.forecastwd.get_visible())):
+ self.forecastwd = ExtendedForecast()
+ self.forecastwd.show()
+
+ # Quit the applet
+ def quit(self, widget, data=None):
+ log.debug("Indicator: Quitting")
+ gtk.main_quit()
+
+class PreferencesDialog(gtk.Dialog):
+ """ Class for preferences dialog """
+ __gtype_name__ = "PreferencesDialog"
+
+ # Creating a new preferences dialog
+ def __new__(cls):
+ log.debug("Preferences: creating")
+ builder = get_builder('PreferencesDialog')
+ new_object = builder.get_object("preferences_dialog")
+ new_object.finish_initializing(builder)
+ return new_object
+
+ # Fill in preferences dialog with currect data
+ def finish_initializing(self, builder):
+ log.debug("Preferences: finishing initialization")
+ log.debug("Preferences: got settings: unit=%s, notif=%s, wind=%s, rate=%s, source=%s" %
+ (wi.unit, wi.notif, wi.wind, wi.rate, wi.source))
+ self.builder = builder
+
+ # Set correct wind_unit using dictionary of wind value and object name
+ self.builder.get_object(wi.metric_systems[wi.unit][0]).set_active(True)
+ self.builder.get_object(wi.notifications[wi.notif]).set_active(True)
+ self.builder.get_object(wi.wind_systems[wi.wind][0]).set_active(True)
+ self.builder.get_object(wi.weather_sources[wi.source][0]).set_active(True)
+ self.builder.get_object('show_label').set_active(wi.show_label)
+ self.builder.get_object('show_label').set_visible(hasattr(wi.winder, 'set_label'))
+ self.builder.get_object('rate').set_value(float(wi.rate))
+
+ log.debug("Preferences: Loading places")
+ if wi.places != None:
+ for place in wi.places:
+ if len(place)>1:
+ log.debug("Preferences: Places: got (%s, %s)" % (place[1], place[0]))
+ newplace = list()
+ newplace.append(place[1])
+ newplace.append(place[0])
+ newplace.append(wi.settings.get_location_details(place[0]))
+
+ self.builder.get_object('citieslist').append(newplace)
+ self.builder.get_object('ok_button').set_sensitive(True)
+
+ self.builder.connect_signals(self)
+
+ # 'Remove' clicked - remove location from list
+ #TODO: Update settings object
+ def on_remove_location(self, widget):
+ selection = self.builder.get_object('location_list').get_selection()
+ model, iter = selection.get_selected()
+ if iter != None:
+ log.debug("Preferences: Removing location %s (code %s)" % (model[iter][0], model[iter][1]))
+ model.remove(iter)
+
+ if (self.builder.get_object('citieslist').get_iter_first() == None):
+ self.builder.get_object('ok_button').set_sensitive(False)
+
+ # 'Add' clicked - create a new Assistant
+ def on_add_location(self, widget):
+ log.debug("Preferences: Add location clicked")
+ if ((not hasattr(self, 'assistant')) or (not self.assistant.get_visible())):
+ self.assistant = Assistant()
+ self.assistant.show()
+
+ # 'OK' clicked - save settings
+ def ok(self, widget, data=None):
+ log.debug("Preferences: Saving settings")
+ need_to_update_weather = False
+ need_to_update_indicator = False
+
+ #Show label near icon
+ new_show_label = self.builder.get_object('show_label').get_active()
+ if (wi.show_label != new_show_label):
+ wi.show_label = new_show_label
+ wi.settings.set_value("show_label", new_show_label)
+ need_to_update_weather = False
+ need_to_update_indicator = True
+ log.debug("Preferences: Show Label changed to '%s'" % wi.show_label)
+
+ # Metric systems
+ for k in wi.metric_systems.keys():
+ if self.builder.get_object(wi.metric_systems[k][0]).get_active():
+ new_unit = k
+ new_metric_system = wi.metric_systems[k][1]
+
+ if (wi.unit != new_unit):
+ wi.unit = new_unit
+ wi.metric_system = new_metric_system
+ wi.settings.set_value("unit", wi.unit)
+ need_to_update_weather = True
+ log.debug("Preferences: Unit changed to '%s'" % wi.unit)
+
+ # Notifications
+ for k in wi.notifications.keys():
+ if self.builder.get_object(wi.notifications[k]).get_active():
+ new_notification = k
+
+ if (wi.notif != new_notification):
+ wi.notif = new_notification
+ wi.settings.set_value("notif", wi.notif)
+ need_to_update_weather = True
+ log.debug("Preferences: Notifications changed to '%s'" % wi.notif)
+
+ # Wind Units
+ for k in wi.wind_systems.keys():
+ if self.builder.get_object(wi.wind_systems[k][0]).get_active():
+ new_wind_unit = k
+ new_wind_system = wi.wind_systems[k][1]
+
+ if (wi.wind != new_wind_unit):
+ wi.wind = new_wind_unit
+ wi.wind_unit = new_wind_system
+ wi.settings.set_value("wind", wi.wind)
+ need_to_update_weather = True
+ log.debug("Preferences: Wind Unit changed to '%s'" % wi.wind)
+
+ # Weather source
+ for k in wi.weather_sources.keys():
+ if self.builder.get_object(wi.weather_sources[k][0]).get_active():
+ new_source = k
+ new_weather_source = wi.weather_sources[k][1]
+
+ if (wi.source != new_source):
+ wi.source = new_source
+ wi.weather_source = new_weather_source
+ wi.settings.set_value("data_source", wi.source)
+ need_to_update_weather = True
+ log.debug("Preferences: Weather Source changed to '%s'" % wi.source)
+
+ # Rate
+ if int(self.builder.get_object('rate').get_value()) != wi.rate:
+ wi.settings.set_value("refresh_rate", int(self.builder.get_object('rate').get_value()))
+ wi.rate = int(self.builder.get_object('rate').get_value())
+ log.debug("Preferences: Rate changed to '%s'" % wi.rate)
+ wi.schedule_weather_update()
+
+ # Get places from location list
+ newplaces = list()
+ item = self.builder.get_object('citieslist').get_iter_first()
+ while (item != None):
+ newplace = list()
+ newplace.append(self.builder.get_object('citieslist').get_value (item, 1))
+ newplace.append(self.builder.get_object('citieslist').get_value (item, 0))
+ newplaces.append(newplace)
+ item = self.builder.get_object('citieslist').iter_next(item)
+
+ # If places have changed - update weather data
+ if newplaces != wi.places:
+ wi.places = newplaces
+ log.debug("Preferences: Places changed to '%s'" % str(wi.places))
+ wi.settings.set_value("places", str(wi.places))
+ if (type(wi.place) != None) and (wi.place in wi.places):
+ wi.placechosen = wi.places.index(wi.place)
+ else:
+ wi.placechosen = 0
+ wi.place = wi.places[0]
+ log.debug("Preferences: Place Chosen changed to '%s'" % wi.placechosen)
+ wi.settings.set_value("placechosen", wi.placechosen)
+ wi.location_details = eval(wi.settings.get_location_details(wi.place[0]))
+ wi.menu_normal()
+ wi.set_refresh_label()
+ need_to_update_weather = True
+
+ if need_to_update_weather:
+ wi.update_weather(False)
+
+ if need_to_update_indicator:
+ wi.update_label(wi.previous_label_value)
+
+ self.destroy()
+
+ # 'Cancel' click - forget all changes
+ def cancel(self, widget, data=None):
+ log.debug("Preferences: Cancelling")
+ self.destroy()
+
+class ExtendedForecast(gtk.Window):
+ """ Class for forecast window """
+ __gtype_name__ = "ExtendedForecast"
+
+ # Create forecast
+ def __new__(cls):
+ log.debug("ExtendedForecast: creating")
+ builder = get_builder('ExtendedForecast')
+ new_object = builder.get_object("extended_forecast")
+ new_object.finish_initializing(builder)
+ return new_object
+
+ # Fill in forecast parameters
+ def finish_initializing(self, builder):
+ log.debug("ExtendedForecast: finishing initialization")
+ self.builder = builder
+ self.builder.connect_signals(self)
+
+ # Get forecast data using Forecast object
+ log.debug("ExtendedForecast: chosen place: %s (code %s)" % (wi.places[wi.placechosen][1], wi.places[wi.placechosen][0]))
+ self.builder.get_object('extended_forecast').set_title("%s %s" % (_('Weather Forecast for '), wi.places[wi.placechosen][1]))
+ log.debug("ExtendedForecast: getting forecast data")
+ forecast = Forecast(wi.metric_system, wi.current_location.location_details['latitude'], wi.current_location.location_details['longitude'], locale_name)
+ forecast.prepare_forecast_data()
+ if forecast.error_message != None:
+ #Error occurred while getting forecast data
+ self.builder.get_object('connection_error').set_text("%s" % forecast.error_message)
+ self.builder.get_object('connection_error').set_visible(True)
+ self.builder.get_object('hbox1').set_visible(False)
+ else:
+ daysofweek = forecast.get_forecast_daysofweek()
+ forecast_data = forecast.get_forecast_data()
+ if forecast_data == None:
+ # Forecast data unavailable - hide elements and show 'connection_error' label
+ self.builder.get_object('connection_error').set_visible(True);
+ self.builder.get_object('hbox1').set_visible(False);
+ self.builder.get_object('hseparator1').set_visible(False);
+ return
+ (highdata, lowdata) = forecast_data
+ icons = forecast.get_forecast_icons()
+ conditions = forecast.get_forecast_conditions()
+
+ log.debug("ExtendedForecast: parsing forecast data")
+ # Create labels for each weekday
+ self.builder.get_object('day1lbl').set_label('<big>%s</big>' % daysofweek[0].capitalize())
+ self.builder.get_object('day2lbl').set_label('<big>%s</big>' % daysofweek[1].capitalize())
+ self.builder.get_object('day3lbl').set_label('<big>%s</big>' % daysofweek[2].capitalize())
+ self.builder.get_object('day4lbl').set_label('<big>%s</big>' % daysofweek[3].capitalize())
+
+ # Fill in icons
+ for i in xrange(1,5):
+ # Get icon name from dictionary in Weather object for Google icons
+ try:
+ conds = Weather._GoogleConditions.get(icons[i-1])
+ if conds != None:
+ google_icon = conds[0]
+ else:
+ log.error("ExtendedForecast: unknown Google weather condition '%s'" % icons[i-1])
+ log.error(forecast.forecast)
+ google_icon = 'weather-indicator-unknown'
+ self.builder.get_object('day%simage' % str(i)).set_from_icon_name(google_icon,gtk.ICON_SIZE_BUTTON)
+ except IndexError:
+ log.error("ExtendedForecast: Google didn't return condition for %s days" % i-1)
+ log.error(forecast.forecast)
+
+ # Fill in condition labels
+ for i in xrange(1,5):
+ if conditions[i-1] != '':
+ condition = conditions[i-1]
+ else:
+ condition = _("Unknown condition")
+ self.builder.get_object('day%scond' % str(i)).set_label(condition)
+
+ # Fill in High and Low temperatures
+ if wi.metric_system == MetricSystem.SI:
+ tempunit = '°C'
+ else:
+ tempunit = '°F'
+ for i in xrange(1,5):
+ label = "%s: %s%s" % (_('High'), highdata[i-1],tempunit)
+ self.builder.get_object('day%stemphigh' % str(i)).set_label(label)
+ label = "%s: %s%s" % (_('Low'), lowdata[i-1],tempunit)
+ self.builder.get_object('day%stemplow' % str(i)).set_label(label)
+
+ # Closing forecast window
+ def close(self, widget, data=None):
+ log.debug("ExtendedForecast: closing window")
+ self.destroy()
+
+ def on_destroy(self, widget):
+ pass
+
+class Assistant(gtk.Assistant):
+ """ Class for a wizard, which helps to add a new location in location list """
+ __gtype_name__ = "Assistant"
+
+ # Create new object
+ def __new__(cls):
+ log.debug("Assistant: creating new Assistance instance")
+ builder = get_builder('Assistant')
+ new_object = builder.get_object("assistant")
+ new_object.finish_initializing(builder)
+ return new_object
+
+ # Finish UI initialization - prepare combobox
+ def finish_initializing(self, builder):
+ log.debug("Assistant: finishing initialization")
+ self.builder = builder
+ self.builder.connect_signals(self)
+ self.assistant = self.builder.get_object("assistant")
+ self.assistant.set_page_complete(self.builder.get_object("label"),True)
+ self.assistant.set_page_complete(self.builder.get_object("review"),True)
+
+ # Set up combobox
+ log.debug("Assistant: setting up location combobox")
+ self.store = gtk.ListStore(str, str, str, str, str)
+ self.location_input_combo = self.builder.get_object("combolocations")
+ self.location_input_combo.set_model(self.store)
+ self.location_input_combo.set_text_column(0)
+ self.location_entry = self.builder.get_object("entrylocation")
+ self.place_selected = None
+ self.location = None
+
+ self.assistant.set_forward_page_func(self.next_page)
+
+ # 'Get cities' button clicked - get suggested cities list
+ def on_get_city_names(self, widget):
+ new_text = self.location_entry.get_text()
+ log.debug("Assistant: looking for location '%s'" % new_text)
+ try:
+ # Clear up exising suggestions
+ self.store.clear()
+ # Get suggested city names from GeoNames DB in native locale
+ new_text = urllib.quote(new_text)
+ url = 'http://api.geonames.org/searchJSON?q=%s&featureClass=P&maxRows=10&lang=%s&username=indicatorweather' % (new_text, locale_name)
+ cities = eval(urllib2.urlopen(url).read())
+ for city in cities['geonames']:
+ # Create a full city name, consisting of city name, administrative areas names and country name
+ if 'adminName2' in city:
+ displayed_city_name = "%s, %s, %s, %s" % (city['name'], city['adminName1'], city['adminName1'], city['countryName'])
+ elif 'adminName1' in city:
+ displayed_city_name = "%s, %s, %s" % (city['name'], city['adminName1'], city['countryName'])
+ else:
+ displayed_city_name = "%s, %s" % (city['name'], city['countryName'])
+ self.store.append([displayed_city_name, str(city['geonameId']), str(city['lat']), str(city['lng']), str(city['name'])])
+ self.location_input_combo.popup()
+ except urllib2.URLError:
+ log.error("Assistant: error reaching url '%s'" % url)
+
+ # A city is selected from suggested list
+ def on_select_city(self, entry):
+ if self.location_input_combo.get_active() != -1:
+ self.place_selected = self.store[self.location_input_combo.get_active()]
+ self.assistant.set_page_complete(self.builder.get_object("placeinput"),True)
+ else:
+ self.place_selected = None
+ self.location = None
+ self.assistant.set_page_complete(self.builder.get_object("placeinput"), False)
+
+ # Create a location object out of a selected location
+ def next_page(self, current_page):
+ log.debug("Assistant: moved to page %s" % current_page)
+ if (self.assistant.get_current_page() == 0) and not self.location and self.place_selected:
+ # Label input page
+ log.debug("Assistant: Page %s: got location with code %s" % (current_page, self.place_selected[1]))
+ self.location = Location(wi.metric_system, wi.wind_unit)
+ if self.location.prepare_location(self.place_selected):
+ log.debug("Assistant: Page %s: City %s found" % (current_page, self.place_selected[0]))
+ # Set a short city name as default label
+ self.builder.get_object("entrylbl").set_text(self.place_selected[4])
+ else:
+ log.error("Assistant: Page %s: City with code %s was NOT found" % (current_page, self.place_selected[0]))
+ return 3
+ elif self.assistant.get_current_page() == 1:
+ # Confirmation page
+ lbl = self.builder.get_object("entrylbl").get_text()
+ log.debug("Assistant: Page %s: City label is %s" % (current_page, lbl))
+ # If empty label was input, set label to short city name
+ if lbl == '':
+ log.debug("Assistant: Page %s: Empty label found, setting lbl to short name - %s" % (current_page, self.place_selected[4]))
+ lbl = self.place_selected[4]
+ self.location.location_details['label'] = lbl
+ self.builder.get_object("lbl3").set_label(_('Label:'))
+ self.builder.get_object("labellbl").set_label('<b>%s</b>' % lbl)
+ self.builder.get_object("placelbl").set_label('<b>%s</b>' % self.place_selected[0])
+
+ return self.assistant.get_current_page() + 1
+
+ # 'Cancel' clicked
+ def on_cancel(self,widget):
+ log.debug("Assistant: Cancelled")
+ self.destroy()
+
+ # 'Apply' clicked - save location details, add an entry in a location list
+ def on_apply(self,widget):
+ (location_code, location_details) = self.location.export_location_details()
+ log.debug("Assistant: Apply: adding location ('%s', '%s')" % (self.location.location_details['label'], location_code))
+ newplace = list()
+ newplace.append(self.location.location_details['label'])
+ newplace.append(str(location_code))
+ newplace.append(str(location_details))
+ wi.settings.save_location_details(eval(str(location_details)), str(location_code))
+ wi.prefswindow.builder.get_object('citieslist').append(newplace)
+ # Enable 'OK' button in Preferences
+ wi.prefswindow.builder.get_object('ok_button').set_sensitive(True)
+ self.hide()
+
+class SingleInstance(object):
+ """ Class to ensure, that single instance of the applet is run for each user """
+
+ # Initialize, specifying a path to store pids
+ def __init__(self, pidPath):
+ self.pidPath=pidPath
+ # See if pidFile exists
+ if os.path.exists(pidPath):
+ log.debug("SingleInstance: pid file %s exists" % pidPath)
+ # Make sure it is not a "stale" pidFile
+ pid=open(pidPath, 'r').read().strip()
+ # Check list of running pids, if not running it is stale so overwrite
+ pidRunning = commands.getoutput('ls -1 /proc | grep ^%s$' % pid)
+ log.debug("SingleInstance: pid running %s" % pidRunning)
+ self.lasterror = True if pidRunning else False
+ else:
+ self.lasterror = False
+
+ if not self.lasterror:
+ log.debug("SingleInstance: writing new pid %s" % str(os.getpid()))
+ # Create a temp file, copy it to pidPath and remove temporary file
+ (fp, temp_path)=tempfile.mkstemp()
+ try:
+ os.fdopen(fp, "w+b").write(str(os.getpid()))
+ shutil.copy(temp_path, pidPath)
+ os.unlink(temp_path)
+ except Exception as e:
+ log.error("SingleInstance: exception while renaming '%s' to '%s':\n %s" % (temp_path, pidPath, str(e)))
+
+ def is_already_running(self):
+ return self.lasterror
+
+ def __del__(self):
+ if not self.lasterror:
+ log.debug("SingleInstance: deleting %s" % self.pidPath)
+ os.unlink(self.pidPath)
+
+def main():
+ gtk.main()
+ return 0
+
+if __name__ == "__main__":
+ #Enable and configure logs
+ global log
+ cachedir = os.environ.get('XDG_CACHE_HOME','').strip()
+ if not cachedir:
+ cachedir = os.path.expanduser("~/.cache")
+ log_filename = os.path.join(cachedir, "indicator-weather.log")
+ log = logging.getLogger('IndicatorWeather')
+ log.propagate = False
+ log.setLevel(logging.DEBUG)
+ log_handler = logging.handlers.RotatingFileHandler(log_filename, maxBytes=1024*1024, backupCount=5)
+ log_formatter = logging.Formatter("[%(threadName)s] %(asctime)s - %(levelname)s - %(message)s")
+ log_handler.setFormatter(log_formatter)
+ log.addHandler(log_handler)
+
+ log.info("------------------------------")
+ log.info("Started Weather Indicator from %s" % PROJECT_ROOT_DIRECTORY)
+ log.info("Weather Indicator version %s" % VERSION)
+
+ # Single instance stuff for weather indicator
+ myapp = SingleInstance("/tmp/indicator-weather-%d.pid" % os.getuid())
+ # check is another instance of same program running
+ if myapp.is_already_running():
+ log.info("Another instance of this program is already running")
+ sys.exit(_("Another instance of this program is already running"))
+
+ # Set http proxy support
+ ProxyMonitor.monitor_proxy(log)
+ # Use date-time format as in indicator-datetime
+ TimeFormatter.monitor_indicator_datetime(log)
+
+ # not running, safe to continue...
+ gtk.gdk.threads_init()
+ gtk.gdk.threads_enter()
+ # Remember locale name
+ global locale_name
+ locale_name = locale.getlocale()[0]
+ if locale_name is not None:
+ locale_name = locale_name.split('_')[0]
+ else:
+ locale.setlocale(locale.LC_ALL, 'C') # use default (C) locale
+ locale_name = "en"
+ wi = indicator_weather()
+ main()
+ gtk.gdk.threads_leave()
=== added file 'data/indicator-weather.desktop'
--- data/indicator-weather.desktop 1970-01-01 00:00:00 +0000
+++ data/indicator-weather.desktop 2013-05-18 18:22:26 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Weather Indicator Applet
+Comment=Indicator applet for current weather conditions
+GenericName=Weather Applet
+Categories=GNOME;Utility;
+Exec=indicator-weather
+Icon=/usr/share/indicator-weather/media/icon.png
+Hidden=False
+X-GNOME-Autostart-enabled=true
+Type=Application
=== added file 'data/indicator-weather.gschema.xml'
--- data/indicator-weather.gschema.xml 1970-01-01 00:00:00 +0000
+++ data/indicator-weather.gschema.xml 2013-05-18 18:22:26 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema id="apps.indicators.weather" path="/apps/indicators/weather/">
+ <key type="i" name="indicator-display">
+ <default>0</default>
+ <summary>Display icon/label in the indicator</summary>
+ <description>0 - display icon only, 1 - display label only, 2 - display both icon and text</description>
+ </key>
+ <key type="s" name="notifications">
+ <default>'N'</default>
+ <summary>Notifications</summary>
+ <description>Notifications</description>
+ </key>
+ <key type="b" name="global-notifications">
+ <default>false</default>
+ <summary>Global notifications</summary>
+ <description>Global notifications</description>
+ </key>
+ <key type="s" name="weather-source">
+ <default>'Y'</default>
+ <summary>Weather source</summary>
+ <description>Weather source</description>
+ </key>
+ <key type="i" name="refresh-rate">
+ <default>15</default>
+ <summary>Refresh rate</summary>
+ <description>Refresh rate</description>
+ </key>
+ <key type="s" name="metric-system">
+ <default>'S'</default>
+ <summary>metric system</summary>
+ <description>metric system</description>
+ </key>
+ <key type="s" name="wind-unit">
+ <default>'mph'</default>
+ <summary>wind unit</summary>
+ <description>wind unit</description>
+ </key>
+ <key type="b" name="show-forecast">
+ <default>true</default>
+ <summary>show forecast</summary>
+ <description>show forecast</description>
+ </key>
+ <key type="b" name="show-locations">
+ <default>false</default>
+ <summary>show locations</summary>
+ <description>show locations</description>
+ </key>
+ <key type="b" name="filter-fields">
+ <default>true</default>
+ <summary>filter fields</summary>
+ <description>filter fields</description>
+ </key>
+ <key type="s" name="condition-fields">
+ <default>'["heat-index", "humidity", "wind", "sun"]'</default>
+ <summary>condition fields</summary>
+ <description>condition fields</description>
+ </key>
+ <key type="i" name="placechosen">
+ <default>0</default>
+ <summary>placechosen</summary>
+ <description>placechosen</description>
+ </key>
+ <key type="s" name="places">
+ <default>'[]'</default>
+ <summary>places</summary>
+ <description>places</description>
+ </key>
+ <key type="s" name="weather">
+ <default>'{}'</default>
+ <summary>Cached weather data</summary>
+ <description>Cache weather data</description>
+ </key>
+ <key type="s" name="locations">
+ <default>'{}'</default>
+ <summary>location data</summary>
+ <description>location data</description>
+ </key>
+ </schema>
+</schemalist>
=== modified file 'data/ui/Assistant.ui'
--- data/ui/Assistant.ui 2011-04-29 01:31:46 +0000
+++ data/ui/Assistant.ui 2013-05-18 18:22:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
@@ -291,3 +292,244 @@
</child>
</object>
</interface>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires assistant 1.0 -->
+ <!-- interface-naming-policy project-wide -->
+ <!-- interface-local-resource-path ../media -->
+ <object class="Assistant" id="assistant">
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Add a location</property>
+ <property name="window_position">mouse</property>
+ <property name="default_width">400</property>
+ <property name="default_height">200</property>
+ <property name="resizable">False</property>
+ <signal name="apply" handler="on_apply"/>
+ <signal name="cancel" handler="on_cancel"/>
+ <!--<child>
+ <placeholder/>
+ </child> -->
+ <child>
+ <object class="GtkVBox" id="placeinput">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="lblplaceinput">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="ypad">6</property>
+ <property name="label" translatable="yes">Please search our database for your location:</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="city_input_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBoxEntry" id="combolocations">
+ <property name="visible">True</property>
+ <signal name="changed" handler="on_select_city"/>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="entrylocation">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="getcities">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Search</property>
+ <signal name="clicked" handler="on_get_city_names"/>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="title" translatable="yes">Select a location</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="label">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="lblwould">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Please enter a name for this location:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entrylbl">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="title" translatable="yes">Name the location</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="review">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <child>
+ <object class="GtkLabel" id="lblreview">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="ypad">6</property>
+ <property name="label" translatable="yes">Please review the choices below. If anything is not correct, please go back and select the correct options.</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkHBox" id="revlabel">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkArrow" id="arrow3">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lbl3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Label:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labellbl">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Home</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="revplace">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkArrow" id="arrow2">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lbl2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Location:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="placelbl">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Orange, Texas</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="page_type">confirm</property>
+ <property name="title" translatable="yes">Review choices</property>
+ </packing>
+ </child>
+ </object>
+</interface>
+>>>>>>> MERGE-SOURCE
=== modified file 'data/ui/ExtendedForecast.ui'
--- data/ui/ExtendedForecast.ui 2011-05-02 02:30:04 +0000
+++ data/ui/ExtendedForecast.ui 2013-05-18 18:22:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
@@ -559,3 +560,449 @@
</child>
</object>
</interface>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires extended_forecast 1.0 -->
+ <!-- interface-naming-policy project-wide -->
+ <!-- interface-local-resource-path ../media -->
+ <object class="ExtendedForecast" id="extended_forecast">
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Extended Forecast</property>
+ <property name="resizable">False</property>
+ <property name="window_position">mouse</property>
+ <property name="icon">../media/icon.png</property>
+ <signal name="destroy" handler="on_destroy"/>
+ <child>
+ <object class="GtkVBox" id="mainvbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="connection_error">
+ <property name="visible">False</property>
+ <property name="ypad">10</property>
+ <property name="label"><big>Forecast information cannot be fetched. Connection cannot be established.</big></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">False</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="right_padding">6</property>
+ <child>
+ <object class="GtkVBox" id="day1vbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="day1lbl">
+ <property name="visible">True</property>
+ <property name="ypad">10</property>
+ <property name="label"><big>Today (fri.)</big></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="day1image">
+ <property name="visible">True</property>
+ <property name="pixel_size">50</property>
+ <property name="icon_name">weather-showers</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day1cond">
+ <property name="height_request">80</property>
+ <property name="visible">True</property>
+ <property name="label">Partially cloudy</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="day1temphigh">
+ <property name="visible">True</property>
+ <property name="label">High : 23°C</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day1templow">
+ <property name="visible">True</property>
+ <property name="label">Low : 19°C</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator1">
+ <property name="width_request">2</property>
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="right_padding">6</property>
+ <child>
+ <object class="GtkVBox" id="day2vbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="day2lbl">
+ <property name="visible">True</property>
+ <property name="ypad">10</property>
+ <property name="label"><big>Tomorrow (sat.)</big></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="day2image">
+ <property name="visible">True</property>
+ <property name="pixel_size">50</property>
+ <property name="icon_name">weather-storm</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day2cond">
+ <property name="height_request">80</property>
+ <property name="visible">True</property>
+ <property name="label">Couverture nuageuse partielle</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="day2temphigh">
+ <property name="visible">True</property>
+ <property name="label">High : 26°C</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day2templow">
+ <property name="visible">True</property>
+ <property name="label">Low : 16°C</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator2">
+ <property name="width_request">2</property>
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="right_padding">6</property>
+ <child>
+ <object class="GtkVBox" id="day3vbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="day3lbl">
+ <property name="visible">True</property>
+ <property name="ypad">10</property>
+ <property name="label"><big>Sunday</big></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="day3image">
+ <property name="visible">True</property>
+ <property name="pixel_size">50</property>
+ <property name="icon_name">weather-fog</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day3cond">
+ <property name="height_request">80</property>
+ <property name="visible">True</property>
+ <property name="label">Fogs</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="day3temphigh">
+ <property name="visible">True</property>
+ <property name="label">High : 28°C</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day3templow">
+ <property name="visible">True</property>
+ <property name="label">Low : 16°C</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator3">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="day4vbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="day4lbl">
+ <property name="visible">True</property>
+ <property name="ypad">10</property>
+ <property name="label"><big>Monday</big></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="day4image">
+ <property name="visible">True</property>
+ <property name="pixel_size">50</property>
+ <property name="icon_name">weather-clear</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day4cond">
+ <property name="height_request">80</property>
+ <property name="visible">True</property>
+ <property name="label">Clear</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="day4temphigh">
+ <property name="visible">True</property>
+ <property name="label">High : 26°C</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day4templow">
+ <property name="visible">True</property>
+ <property name="label">Low : 14°C</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <child>
+ <object class="GtkVButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="closebtn">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="close"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
+>>>>>>> MERGE-SOURCE
=== modified file 'data/ui/PreferencesDialog.ui'
--- data/ui/PreferencesDialog.ui 2012-03-12 04:56:03 +0000
+++ data/ui/PreferencesDialog.ui 2013-05-18 18:22:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
@@ -987,3 +988,632 @@
<property name="page_increment">10</property>
</object>
</interface>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires preferences_dialog 1.0 -->
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkListStore" id="citieslist">
+ <columns>
+ <!-- column-name Label -->
+ <column type="gchararray"/>
+ <!-- column-name City -->
+ <column type="gchararray"/>
+ <!-- column-name Location Details -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="PreferencesDialog" id="preferences_dialog">
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Weather Indicator Preferences</property>
+ <property name="window_position">mouse</property>
+ <property name="default_width">320</property>
+ <property name="default_height">300</property>
+ <property name="icon">../media/icon.png</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vboxpreferences">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox10">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkCheckButton" id="enableindicator">
+ <property name="label" translatable="yes">Enable the Weather Indicator Applet</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0.02</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show temperature near indicator</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_updateevery">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="updateevery">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Update every</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton_rate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">rate</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="notificationslabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes"><b>Notifications</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="nonotif">
+ <property name="label" translatable="yes">No notifications</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="notifsevere">
+ <property name="label" translatable="yes">Only use notifications to give severe weather alerts</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">nonotif</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="notifall">
+ <property name="label" translatable="yes">Use notifications to give every weather condition change</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">nonotif</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="weathersourcelabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes"><b>Weather Data Source</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="google">
+ <property name="label" translatable="yes">Google</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="yahoo">
+ <property name="label" translatable="yes">Yahoo!</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">google</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="Metric System Unit">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes"><b>Temperature Scale</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="imperial">
+ <property name="label" translatable="yes">Imperial (°F)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="si">
+ <property name="label" translatable="yes">SI (metric, °C)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">imperial</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="Wind Speed Unit">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes"><b>Wind Speed Unit</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="mps">
+ <property name="label" translatable="yes">Meter per second (m/s)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="mph">
+ <property name="label" translatable="yes">Miles per hour (mph)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">mps</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="kph">
+ <property name="label" translatable="yes">Kilometers per hour (km/h)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">mps</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="beaufort">
+ <property name="label" translatable="yes">Beaufort</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">mps</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="knots">
+ <property name="label" translatable="yes">Knots</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">mps</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Units</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="window_placement_set">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="location_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">citieslist</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="reorderable">True</property>
+ <property name="search_column">0</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="City">
+ <property name="title">City</property>
+ <property name="reorderable">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="City name"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_add_location"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="remove">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_remove_location"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Locations</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="cancel"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="ok"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancel_button</action-widget>
+ <action-widget response="-5">ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="rate">
+ <property name="lower">1</property>
+ <property name="upper">30</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+</interface>
+>>>>>>> MERGE-SOURCE
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2013-05-18 18:22:26 +0000
@@ -0,0 +1,408 @@
+indicator-weather (12.07.30~precise1) precise; urgency=low
+ * Skip sunset and sunrise check as Earthtools.org is down (LP: #964365)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Mon, 30 Jul 2012 07:01:51 +0300
+
+indicator-weather (11.11.28~precise2) precise; urgency=low
+ * Don't write too much debug info in the log (LP: #917253)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Wed, 18 Jan 2012 10:03:20 +0300
+
+indicator-weather (11.11.27~precise1) precise; urgency=low
+
+ * Bugfix version for Cloudy 9
+ * Preferences buttons OK and Cancel and Forecast's Close are not focusable (LP: #853774)
+ * Fixed installation error due to incorrect icon copying (LP: #808538)
+ * Don't crash if Google doesn't return icons (LP: #809187)
+ * Display degrees in wind info item if Yahoo is selected (LP: #838369)
+ * Fixed Assistant behavior for Forward/Back movements (LP: #804659)
+ * Fixed a crash when Unknown wind condition was returned, thanks Tomasz Maciejewski! (LP: #886028)
+ * Removed autostart feature - should be implemented in UI (LP: #873386)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 27 Nov 2011 10:47:41 +0300
+
+indicator-weather (11.05.31~precise7) precise; urgency=low
+
+ * Ported from python-support to dh_python2
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Wed, 22 Jun 2011 02:27:38 -0700
+
+indicator-weather (11.05.31~precise6) precise; urgency=low
+
+ * Bugfix version for Cloudy 8
+ * Proper fix of self.db.list_keys() for precise users (LP: #791615)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Tue, 14 Jun 2011 05:12:19 -0700
+
+indicator-weather (11.05.31~precise5) precise; urgency=low
+
+ * Bugfix version for Cloudy 8
+ * Show default labels if some data from providers is missing (LP: #794473)
+ * Using try-catch instead self.db.list_keys() for precise users (LP: #791615)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Tue, 14 Jun 2011 04:12:33 -0700
+
+indicator-weather (11.05.31~precise4) precise; urgency=low
+
+ * Bugfix version for Cloudy 8
+ * Another update for Google icon path changes
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Mon, 06 Jun 2011 02:57:42 -0700
+
+indicator-weather (11.05.31~precise3) precise; urgency=low
+
+ * Bugfix version for Cloudy 8
+ * Display correct icon and description for empty condition in forecast (LP: #791733)
+ * Updated google icon paths for Google icons (LP: #791724)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Thu, 02 Jun 2011 02:15:24 -0700
+
+indicator-weather (11.05.31~precise2) precise; urgency=low
+
+ * Bugfix version for Cloudy 8
+ * Attach dconf settings to apport results (LP: #731911)
+ * Store show_label in dconf correctly (LP: #791398)
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Thu, 02 Jun 2011 00:53:06 -0700
+
+indicator-weather (11.05.31~precise1) precise; urgency=low
+
+ * New release in Cloudy series
+ * Ported settings to dconf, which will solve a number of desktopcouch-related bugs
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Tue, 31 May 2011 02:43:24 -0700
+
+indicator-weather (11.05.30~precise1) precise; urgency=low
+
+ * New release in Cloudy series
+ * Fix for LP: #776586 "I get "Unknown error occurred while picking up weather data" when trying to open forecast."
+ * Fix for LP: #784935 "indicator-weather crash - KeyError: 'wind_condition'"
+ * Fix for LP: #788780 "indicator disappears with no reason"
+ * Fix for LP: #774406 "Insufficient http-proxy detection", thanks Panagiotis
+ * Fix for LP: #782572 "The log should contain Weather Indicator version"
+ * Fix for LP: #780585 "Celsius is not an SI unit"
+ * Fix for LP: #780817 "units mislabeled as kph"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Mon, 30 May 2011 03:20:58 -0700
+
+indicator-weather (11.05.01~precise2) precise; urgency=low
+
+ * New release in Cloudy series
+ * Fix for LP: #765464 "sunrise and sunset info incorrect", thanks Panagiotis!
+ * Fix for LP: #775630 "package indicator-weather 11.05.01~precise1 failed to install/upgrade"
+ * Fix for LP: #772552 "weather applet doesn't start"
+ * Fix for LP: #769842 "Weather Indicator should clear up corrupted DB"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Mon, 02 May 2011 19:59:36 +0300
+
+indicator-weather (11.04.24~precise4) precise; urgency=low
+
+ * New release in Cloudy series
+ * Fix for LP: #747733 "indicator-weather crashed with TypeError in next_page(): unknown type (null)"
+ * Fix for LP: #757195 "Again: Version 11.04.10~precise4 doesn't start"
+ * Fix for LP: #758309 "dpkg error when installing latest build on Ubuntu 11.04 Beta", using patch from Andrew Starr-Bochicchio
+ * Fix for LP: #766049 "Traceback on startup: No module named desktopcouch.records.server"
+ * Fix for LP: #753309 "weather applet displays wrong sunset/sunrise times", using earthtools for both Google and Yahoo
+ * Fix for LP: #765464 "do not see indicator-weather on the panel"
+ * python-apport is now recommended only, thanks Andrew
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 24 Apr 2011 10:57:00 +0300
+
+indicator-weather (11.04.10~precise4) precise; urgency=low
+
+ * New release in Cloudy series
+ * Fix for LP: #743375 "indicator-weather crashed with error in _try_request_with_retries(): [Errno 111] Connection refused"
+ * Fix for LP: #747562 "indicator-weather crashed with AttributeError in get_value(): Settings instance has no attribute 'settings_design_doc'"
+ * Fix for LP: #743840 "Crashes on forecast view"
+ * Fix for LP: #750809 "No "Thunderstorm" icon shown in Forecast only empty place holder.", thanks Felix!
+ * Fix for LP: #743375 "indicator-weather should re-use the time-format of other indicators", thanks Panagiotis!
+ * debian/postinst: copy few-clouds to clouds to show all icons (LP: #710295)
+ * Updated dependencies - added python-gconf
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 10 Apr 2011 10:05:12 +0300
+
+indicator-weather (11.04.02~precise) precise; urgency=low
+
+ * New release in Cloudy series
+ * Fix for LP: #739420 "indicator-weather crashed with KeyError in prepare_forecast_data(): 'unit_system'", thanks Felix!
+ * Fix for LP: #732569 "weather applet freezes on clicking refresh", thanks Panagiotis!
+ * Fix for LP: #745504 "no degree marker ℃ ℉ displayed", thanks Lucian!
+ * Fix for LP: #739029 "Indicator takes up too much space"
+ * Fix for LP: #739029 "Quit button doesn't work", thanks Panagiotis!
+ * Fix for LP: #745634 "http proxy not supported", thanks Panagiotis!
+ * Fix for LP: #742397 "weather applet doesn't refresh information after resume", thanks Panagiotis!
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sat, 02 Apr 2011 12:08:56 +0300
+
+indicator-weather (11.03.27~precise) precise; urgency=low
+
+ * New release in Cloudy series
+ * Fix for LP: #739907 "indicator-weather failed to start falsely reporting duplicate instance", thanks Felix!
+ * Fix for LP: #720030 "indicator invisible on first run", thanks Felix!
+ * Fix for LP: #743347 "what's the meaning of Mixed rain and snow/Sleet/Mixed rain and sleet/Mixed snow and sleet"
+ * Fix for LP: #738671 "Allow only one instance of any dialog"
+ * Fix for LP: #735667 "indicator-weather crashed with NetworkException in FetchReport(): HTTP Error 408: Request Time-out"
+ * Fix for LP: #739209 "indicator-weather crashed with AttributeError in get_value(): 'NoneType' object has no attribute 'execute_view'"
+ * Fix for LP: #738845 "indicator-weather crashed with IOError in about(): [Errno 2] No such file or directory: '/usr/share/doc/indicator-weather/COPYING'"
+ * Fix for LP: #743366 "Location selected but no weather"
+ * Updated Refresh label for plural forms
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 27 Mar 2011 13:27:42 +0300
+
+indicator-weather (11.03.20~precise2) precise; urgency=low
+
+ * Quick fix release for Cloudy
+ * Fix for LP: #738804 "indicator-weather crashed with KeyError in on_get_city_names(): 'geonames'"
+ * Fix for LP: #738762 "indicator-weather crashed with ImportError in /usr/lib/pymodules/python2.7/desktopcouch/records/server.py: No module named application.server"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 20 Mar 2011 20:05:29 +0200
+
+indicator-weather (11.03.20~precise) precise; urgency=low
+
+ * Releasing 11.03.20 "Cloudy" version
+ * Fix for LP: #738503 "indicator-weather crashed with IOError in about(): [Errno 2] No such file or directory: '../AUTHORS' after clicking About..."
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 20 Mar 2011 07:54:50 +0200
+
+indicator-weather (11.02.13+unstable+bzr217+rc3~precise) precise; urgency=low
+
+ * Release Candidate 3
+ * Fix for LP: #713846 "Weather Indicator should have About page"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sat, 19 Mar 2011 11:26:54 +0200
+
+indicator-weather (11.02.13+unstable+bzr214+rc1~precise) precise; urgency=low
+
+ * Release Candidate 2
+ * Fix for LP: #735928 "indicator-weather crashed with NameError in prepare_settings_store(): global name 'DBusException' is not defined"
+ * Fix for LP: #734362 "Use plural forms in translations for units"
+ * Fix for LP: #721714 "Refresh label should contain info about time from last refresh"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sat, 19 Mar 2011 01:33:31 +0200
+
+indicator-weather (11.02.13+unstable+bzr210+rc1~precise) precise; urgency=low
+
+ * Release Candidate 1
+ * Fix for LP: #733760 "indicator-weather crashed with KeyError in save_location_details(): 'yahoo id'"
+ * Fix for LP: #730193 "indicator-weather crashed with AttributeError in get_forecast_daysofweek(): Location instance has no attribute '_Location__parsedforecast'"
+ * Fix for LP: #728473 "Sunrise/sunset time being shown in DST"
+ * Fix for LP: #731236 "Sunset/sunrise time should not include seconds"
+ * Fix for LP: #719886 "An option to display temperature near the icon"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Thu, 10 Mar 2011 09:21:57 +0200
+
+indicator-weather (11.02.13+unstable+bzr204~precise) precise; urgency=low
+
+ * Fix for LP: #732434 "indicator-weather crashed with DBusException in call_blocking(): org.freedesktop.DBus.Error.NoReply"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Thu, 10 Mar 2011 09:21:57 +0200
+
+indicator-weather (11.02.13+unstable+bzr203~precise) precise; urgency=low
+
+ * Fixes for incorrect and missing icons
+ * Fix for LP: #732275 "CouchDB exception on db.compact()"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Thu, 10 Mar 2011 00:23:14 +0200
+
+indicator-weather (11.02.13~unstable+bzr200~precise) precise; urgency=low
+
+ * Implemented Desktopcouch support
+ * Using PyWAPI to get data
+ * Two data sources are available - Yahoo and Google
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Wed, 09 Mar 2011 22:55:00 +0200
+
+indicator-weather (11.02.13+bzr180~precise) precise; urgency=low
+
+ * Implemented UI improvements. Thanks, Andrew
+ * Fix for LP: #719693 "[regression] Menu item will not show up in GNOME-Menu", thanks Andrew Starr-Bochicchio
+ * Fix for LP: #720112 "unsafe tempfile handling"
+ * Fix for LP: #719884 "Metric scales labels should include temperature units"
+ * Immideate update of icons
+ * Fix for missing kph setting on UI
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Thu, 17 Feb 2011 00:13:01 +0200
+
+indicator-weather (11.02.13~precise) precise; urgency=low
+
+ * Migrate to gweather + pymetar data sources
+ * Added an option to choose wind units
+ * Fix for labels crash in precise
+ * Removed countries without cities from the tree
+ * Updated connection handling
+ * Minor fixes for UI in Preferences dialog
+ * Updated settings store logic
+ * Removed knots - caused exceptions, see Bug #712434 in pymetar
+ * Updated icons
+ * Fixed error with incorrect permissions for pid file - now using /tmp
+ * Fix for LP: #712359 "'OK' button in Preferences dialog should be disabled, if location list is empty"
+ * Fix for LP: #712347 "Synapse launcher shows Preferences window instead of Weather Indicator"
+ * Fix for LP: #711891 "cannot go back from "Confirm the place" dialog"
+ * Fix for LP: #711889 "Translation issues"
+ * Fix for LP: #670796 "weather indicator does not wake up after suspend"
+ * Fix for LP: #617801 "Weather Indicator should show humidex value"
+ * Fix for LP: #703561 "Show temperature in icon"
+ * Fix for LP: #705673 "Add city dialogs should have city tree"
+ * Fix for LP: #710870 "Indicator-weather crashed with AttributeError in get_city(): indicator_weather instance has no attribute '_wind_unit'"
+ * Fix for LP: #707681 "Allow only one instance of WI"
+ * Fix for LP: #712680 "Full city name from 'Australasia & Oceania' is not displayed on Assistant page 2"
+ * Fix for LP: #706805 "indicator-weather crashed with AttributeError in get_city(): 'Assistant' object has no attribute 'metric_system'"
+ * Fix for LP: #706796 "indicator-weather crashed with ImportError in __main__: No module named gtkcrashhandler"
+ * Fix for LP: #703681 "Indicator-Weather doesn't recheck for Internet connectivity"
+ * Fix for LP: #703842 "Menus look pale in Ambiance theme"
+ * Fix for LP: #703617 "Use icons of ubuntus date indicator"
+ * Fix for LP: #703693 "Weather applet does not start (icon missing)"
+ * Fix for LP: #706148 "indicator doesn't respect temperature scale preferences (Fahrenheit, Celsius)"
+ * Fix for LP: #703819 "Weather indicator confuses time"
+ * Fix for LP: #703838 "Weather Indicator should have a Quit menu entry"
+ * Fix for LP: #606481 "indicator-weather crashes on startup"
+ * Fix for LP: #703730 "indicator-weather doesn't display an icon for some cities"
+ * Fix for LP: #703838 "Weather Indicator should have a Quit menu entry"
+ * Fix for LP: #618108 "Label is not shown in the dialogs when specified"
+ * Fix for LP: #604265 "First configuration weather unit setting not saved"
+ * Fix for LP: #717907 "Not having a condition name should not be a big deal" - updated error text and icon
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 13 Feb 2011 09:28:08 +0200
+
+indicator-weather (11.01.16~precise) precise; urgency=low
+
+ * Fix for Bug #618108 "Label is not shown in the dialogs when specified"
+ * Fix for Bug #604265 "First configuration weather unit setting not saved"
+
+ -- Vadim Rutkovsky <roignac@xxxxxxxxx> Sun, 16 Jan 2011 14:17:27 +0200
+
+indicator-weather (10.07.16~precise) precise; urgency=low
+
+ * Bugfix : list index out of range fixed
+
+ -- ridem <mehd36@xxxxxxxxx> Sun, 11 Jul 2010 01:11:10 +0200
+
+indicator-weather (10.07.15~precise) precise; urgency=low
+
+ * Sunlight-sunset added/night-day icons/ assistant made thanks to
+ cullen, but no label support for now
+
+ -- ridem <mehd36@xxxxxxxxx> Sat, 10 Jul 2010 21:32:53 +0200
+
+indicator-weather (10.07.14~precise) precise; urgency=low
+
+ * Autostart hidden and works, Assistant works, but needs polish now
+
+ -- ridem <mehd36@xxxxxxxxx> Sat, 10 Jul 2010 04:06:24 +0200
+
+indicator-weather (10.07.13~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 02:48:49 +0200
+
+indicator-weather (10.07.13~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 02:44:18 +0200
+
+indicator-weather (10.07.13~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 02:36:52 +0200
+
+indicator-weather (10.07.13~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 02:31:03 +0200
+
+indicator-weather (10.07.13~precise) precise; urgency=low
+
+ * Autostart, right category, find location in assistant, assistant not
+ finished yet
+
+ -- ridem <mehd36@xxxxxxxxx> Sat, 10 Jul 2010 02:01:21 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 02:00:37 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 01:01:59 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:54:23 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:53:35 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:49:41 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:45:09 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:44:28 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:42:08 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:38:48 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:36:36 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * New release.
+
+ -- Mehdi Rejraji <mehdi@portable-mehdi> Sat, 10 Jul 2010 00:27:40 +0200
+
+indicator-weather (10.07.12~precise) precise; urgency=low
+
+ * Work on assistant
+
+ -- ridem <mehd36@xxxxxxxxx> Fri, 09 Jul 2010 01:26:35 +0200
+
+indicator-weather (10.07.11~precise) precise; urgency=low
+
+ * No intrusion for the first run
+
+ -- ridem <mehd36@xxxxxxxxx> Fri, 09 Jul 2010 01:23:33 +0200
+
+indicator-weather (10.07.10~precise) precise; urgency=low
+
+ * Now etended forecast uses chosen unit
+ * places addded/edited/removed only after Ok. Nice editing and
+ reordering
+
+ -- ridem <mehd36@xxxxxxxxx> Tue, 06 Jul 2010 20:45:27 +0200
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2013-05-18 18:22:26 +0000
@@ -0,0 +1,1 @@
+6
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2013-05-18 18:22:26 +0000
@@ -0,0 +1,26 @@
+Source: indicator-weather
+Section: python
+Priority: extra
+Build-Depends: cdbs (>= 0.4.90-1~),
+ debhelper (>= 6),
+ python (>= 2.6.6-3~),
+ gobject-introspection,
+ python-distutils-extra (>= 2.10)
+Maintainer: Vadim Rutkovsky <roignac@xxxxxxxxx>
+Standards-Version: 3.8.3
+
+Package: indicator-weather
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ libglib2.0-bin,
+ python-appindicator,
+ python-notify,
+ python-gobject,
+ python-gtk2,
+ python-gconf,
+ python-pywapi
+Recommends: python-apport
+Description: A weather indicator for Ubuntu's Indicator Applet
+ A weather indicator that displays information for one or multiple places
+ in the world
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2013-05-18 18:22:26 +0000
@@ -0,0 +1,12 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: indicator-weather
+Upstream-Maintainer: Vadim Rutkovsky <roignac@xxxxxxxxx>
+Upstream-Source: https://launchpad.net/weather-indicator
+
+Files: *
+Copyright: (C) 2010 Mehdi Rejraji mehd36@xxxxxxxxx
+Copyright: (C) 2010 Sebastian MacDonald Sebas310@xxxxxxxxx
+Copyright: (C) 2011 Vadim Rutkovsky <roignac@xxxxxxxxx>
+License: GPL-3
+ The full text of the GPL is distributed in
+ /usr/share/common-licenses/GPL-3 on Debian systems.
=== added file 'debian/indicator-weather.install'
--- debian/indicator-weather.install 1970-01-01 00:00:00 +0000
+++ debian/indicator-weather.install 2013-05-18 18:22:26 +0000
@@ -0,0 +1,1 @@
+debian/source_indicator-weather.py usr/share/apport/package-hooks
=== added file 'debian/postinst'
--- debian/postinst 1970-01-01 00:00:00 +0000
+++ debian/postinst 2013-05-18 18:22:26 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+#DEBHELPER#
+echo "Installing indicator-specific icons..."
+xdg-icon-resource install --theme hicolor --novendor --size 22 /usr/share/indicator-weather/media/icon.png weather-indicator
+xdg-icon-resource install --theme hicolor --novendor --size 22 /usr/share/indicator-weather/media/icon_unknown_condition.png weather-indicator-unknown
+xdg-icon-resource install --theme hicolor --novendor --size 22 /usr/share/indicator-weather/media/icon_connection_error.png weather-indicator-error
+
+#installing dconf schema
+echo "Installing indicator dconf schema..."
+cp /usr/share/indicator-weather/indicator-weather.gschema.xml /usr/share/glib-2.0/schemas
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+#quick fix for incomplete icon themes
+echo "Fixing incomplete weather icons..."
+if [ ! -e "/usr/share/icons/gnome/22x22/status/weather-clouds.png" ]; then
+ ln -s /usr/share/icons/gnome/22x22/status/weather-few-clouds.png /usr/share/icons/gnome/22x22/status/weather-clouds.png
+ ln -s /usr/share/icons/gnome/22x22/status/weather-clouds-night.png /usr/share/icons/gnome/22x22/status/weather-clouds-night.png
+
+ if [ -x /usr/bin/gtk-update-icon-cache-3.0 ]; then
+ if ! gtk-update-icon-cache-3.0; then
+ echo "WARNING: icon cache generation failed"
+ fi
+ fi
+
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ if ! gtk-update-icon-cache; then
+ echo "WARNING: icon cache generation failed"
+ fi
+ fi
+
+else
+ exit 0
+fi
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2013-05-18 18:22:26 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+DEB_PYTHON2_MODULE_PACKAGES:=indicator-weather
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
=== added file 'debian/source_indicator-weather.py'
--- debian/source_indicator-weather.py 1970-01-01 00:00:00 +0000
+++ debian/source_indicator-weather.py 2013-05-18 18:22:26 +0000
@@ -0,0 +1,12 @@
+from apport.hookutils import *
+import os.path
+
+def add_info(report, ui=None):
+ if not apport.packaging.is_distro_package(report['Package'].split()[0]):
+ report['ThirdParty'] = 'True'
+ report['CrashDB'] = 'indicator_weather'
+ report['Settings'] = command_output(['gsettings', 'list-recursively', 'apps.indicators.weather'])
+
+ log_filename = os.path.join(os.path.expanduser("~/.cache"), "indicator-weather.log")
+ if os.path.exists(log_filename):
+ report['IndicatorLog'] = open(log_filename).read()
=== added directory 'etc'
=== added directory 'etc/apport'
=== added directory 'etc/apport/crashdb.conf.d'
=== added file 'etc/apport/crashdb.conf.d/indicator-weather-crashdb.conf'
--- etc/apport/crashdb.conf.d/indicator-weather-crashdb.conf 1970-01-01 00:00:00 +0000
+++ etc/apport/crashdb.conf.d/indicator-weather-crashdb.conf 2013-05-18 18:22:26 +0000
@@ -0,0 +1,6 @@
+
+indicator_weather = {
+ 'impl' : 'launchpad',
+ 'project' : 'weather-indicator',
+ 'bug_pattern_base' : None,
+ }
=== added file 'indicator-weather.desktop.in'
--- indicator-weather.desktop.in 1970-01-01 00:00:00 +0000
+++ indicator-weather.desktop.in 2013-05-18 18:22:26 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Weather Indicator
+_Comment=A weather indicator that displays information for one or multiple places in the world
+GenericName=Weather Applet
+Categories=GNOME;Utility;
+Exec=indicator-weather
+Icon=/usr/share/indicator-weather/media/icon.png
+Hidden=False
+X-GNOME-Autostart-enabled=true
+Type=Application
=== added directory 'indicator_weather'
=== added file 'indicator_weather/__init__.py'
=== added file 'indicator_weather/helpers.py'
--- indicator_weather/helpers.py 1970-01-01 00:00:00 +0000
+++ indicator_weather/helpers.py 2013-05-18 18:22:26 +0000
@@ -0,0 +1,297 @@
+# -*- coding: utf-8 -*-
+### BEGIN LICENSE
+# Copyright (C) 2010 Sebastian MacDonald Sebas310@xxxxxxxxx
+# Copyright (C) 2010 Mehdi Rejraji mehd36@xxxxxxxxx
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+"""Helpers for an Ubuntu application."""
+
+__all__ = [
+ 'get_builder',
+ 'monitor_upower',
+ 'ProxyMonitor',
+ 'TimeFormatter',
+ 'NumberFormatter',
+ ]
+try:
+ from gi.repository import Gio
+ # this has to be called only once, otherwise we get segfaults
+ DCONF_SCHEMAS = Gio.Settings.list_schemas()
+except ImportError:
+ DCONF_SCHEMAS = []
+
+import gconf
+import traceback
+import os
+import gtk
+import urllib2
+import locale
+import re
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+from indicator_weather.indicator_weatherconfig import get_data_file
+
+import gettext
+from gettext import gettext as _
+gettext.textdomain('indicator-weather')
+
+def get_builder(builder_file_name):
+ """Return a fully-instantiated gtk.Builder instance from specified ui
+ file
+
+ :param builder_file_name: The name of the builder file, without extension.
+ Assumed to be in the 'ui' directory under the data path.
+ """
+ # Look for the ui file that describes the user interface.
+ ui_filename = get_data_file('ui', '%s.ui' % (builder_file_name))
+ if not os.path.exists(ui_filename):
+ ui_filename = None
+
+ builder = gtk.Builder()
+ builder.set_translation_domain('indicator-weather')
+ builder.add_from_file(ui_filename)
+ return builder
+
+def monitor_upower(sleep_handler, resume_handler, log):
+ """
+ Attemts to connect to UPower interface
+ """
+ # http://upower.freedesktop.org/docs/UPower.html
+ try:
+ DBusGMainLoop(set_as_default=True)
+ bus = dbus.SystemBus()
+ if not bus.name_has_owner("org.freedesktop.UPower"):
+ log.info("UPower service is missing, cannot monitor power events")
+ return
+
+ proxy = dbus.SystemBus().get_object("org.freedesktop.UPower",
+ "/org/freedesktop/UPower")
+ iface = dbus.Interface(proxy, "org.freedesktop.UPower")
+ iface.connect_to_signal("Sleeping", sleep_handler)
+ iface.connect_to_signal("Resuming", resume_handler)
+ log.info("Monitoring UPower interface")
+
+ except Exception, e:
+ log.error("UPower error: %s" % e)
+
+class ProxyMonitor:
+ """ Class to monitor proxy settings """
+
+ @staticmethod
+ def monitor_proxy(log):
+ ProxyMonitor.log = log
+ try:
+ # disable dconf settings for now
+ # because they do not seem to be in effect
+ if False and "org.gnome.system.proxy.http" in DCONF_SCHEMAS:
+ # load dconf settings
+ proxy_settings = Gio.Settings.new("org.gnome.system.proxy.http")
+ ProxyMonitor.dconf_proxy_changed(proxy_settings)
+ proxy_settings.connect("changed", ProxyMonitor.dconf_proxy_changed)
+ else:
+ # load gconf settings
+ client = gconf.client_get_default()
+ client.add_dir("/system/http_proxy", gconf.CLIENT_PRELOAD_ONELEVEL)
+ ProxyMonitor.gconf_proxy_changed(client)
+ client.notify_add("/system/http_proxy", ProxyMonitor.gconf_proxy_changed)
+
+ except Exception, e:
+ log.error("ProxyMonitor: %s" % e)
+ log.debug(traceback.format_exc(e))
+
+ @staticmethod
+ def dconf_proxy_changed(settings, changed_key=None):
+ """
+ Loads dconf hhtp proxy settings
+ """
+ try:
+ ProxyMonitor.log.debug("ProxyMonitor: loading dconf settings")
+ proxy_info = {}
+ # Taken from http://forum.compiz.org/viewtopic.php?t=9480
+ if settings.get_boolean("enabled"):
+ proxy_info['host'] = settings.get_string("host")
+ proxy_info['port'] = settings.get_int("port")
+ if settings.get_boolean("use-authentication"):
+ proxy_info['user'] = settings.get_string("authentication-user")
+ proxy_info['pass'] = settings.get_string("authentication-password")
+
+ ProxyMonitor.install_proxy_handler(proxy_info)
+
+ except Exception, e:
+ ProxyMonitor.log.error("ProxyMonitor: %s" % e)
+ ProxyMonitor.log.debug(traceback.format_exc(e))
+
+ @staticmethod
+ def gconf_proxy_changed(client, cnxn_id=None, entry=None, data=None):
+ """
+ Loads gconf hhtp proxy settings
+ """
+ try:
+ ProxyMonitor.log.debug("ProxyMonitor: loading gconf settings")
+ proxy_info = {}
+ # Taken from http://forum.compiz.org/viewtopic.php?t=9480
+ if client.get_bool("/system/http_proxy/use_http_proxy"):
+ proxy_info['host'] = client.get_string("/system/http_proxy/host")
+ proxy_info['port'] = client.get_int("/system/http_proxy/port")
+ if client.get_bool("/system/http_proxy/use_authentication"):
+ proxy_info['user'] = client.get_string("/system/http_proxy/authentication_user")
+ proxy_info['pass'] = client.get_string("/system/http_proxy/authentication_password")
+
+ ProxyMonitor.install_proxy_handler(proxy_info)
+
+ except Exception, e:
+ ProxyMonitor.log.error("ProxyMonitor: %s" % e)
+ ProxyMonitor.log.debug(traceback.format_exc(e))
+
+ @staticmethod
+ def install_proxy_handler(proxy_info):
+ """
+ Installs http proxy support in urllib2
+ """
+ # validate data
+ if 'host' in proxy_info:
+ if proxy_info['host'] is not None:
+ proxy_info['host'] = proxy_info['host'].strip()
+ if not proxy_info['host']:
+ ProxyMonitor.log.error("ProxyMonitor: empty proxy host!")
+ proxy_info.pop('host')
+ proxy_info.pop('port')
+ elif not proxy_info['port']:
+ ProxyMonitor.log.error("ProxyMonitor: invalid proxy port!")
+ proxy_info.pop('host')
+ proxy_info.pop('port')
+
+ if 'host' in proxy_info and 'user' in proxy_info:
+ if proxy_info['user'] is not None:
+ proxy_info['user'] = proxy_info['user'].strip()
+ if proxy_info['pass'] is not None:
+ proxy_info['pass'] = proxy_info['pass'].strip()
+ else:
+ proxy_info['pass'] = ""
+ if not proxy_info['user']:
+ ProxyMonitor.log.error("ProxyMonitor: empty proxy user name!")
+ proxy_info.pop('user')
+ proxy_info.pop('pass')
+ proxy_info.pop('host')
+
+ # create proxy handler
+ if 'host' not in proxy_info:
+ ProxyMonitor.log.debug("ProxyMonitor: using direct connection")
+ proxy_support = urllib2.ProxyHandler({})
+
+ elif 'user' not in proxy_info:
+ ProxyMonitor.log.debug("ProxyMonitor: using simple proxy: " + \
+ "%(host)s:%(port)d" % proxy_info)
+ proxy_support = urllib2.ProxyHandler({
+ 'http': "http://%(host)s:%(port)d" % proxy_info})
+ else:
+ ProxyMonitor.log.debug("ProxyMonitor: using proxy with auth: " + \
+ "%(user)s@%(host)s:%(port)d" % proxy_info)
+ proxy_support = urllib2.ProxyHandler({
+ 'http': "http://%(user)s:%(pass)s@%(host)s:%(port)d" % proxy_info})
+
+ # install new urllib2 opener
+ opener = urllib2.build_opener(proxy_support, urllib2.HTTPHandler)
+ urllib2.install_opener(opener)
+
+class TimeFormatter:
+ """
+ Formats a time object with respect to the settings of indicator-datetime
+ """
+
+ # default format from locale
+ format = "%X"
+
+ SETTINGS_TIME_LOCALE = 0
+ SETTINGS_TIME_12_HOUR = 1
+ SETTINGS_TIME_24_HOUR = 2
+ SETTINGS_TIME_CUSTOM = 3
+
+ SCHEMAS = (
+ "com.canonical.indicator.datetime", #natty
+ "org.ayatana.indicator.datetime", #maverick
+ )
+
+ @staticmethod
+ def monitor_indicator_datetime(log):
+ TimeFormatter.log = log
+ try:
+ for schema in TimeFormatter.SCHEMAS:
+ if schema in DCONF_SCHEMAS:
+ log.debug("TimeFormatter: loading indicator-datetime settings: %s" % schema)
+ TimeFormatter.settings = Gio.Settings.new(schema)
+ TimeFormatter.calc_format(TimeFormatter.settings)
+ TimeFormatter.settings.connect("changed", TimeFormatter.calc_format)
+ break
+ # this else belongs to for loop
+ else:
+ log.debug("TimeFormatter: indicator-datetime settings not found")
+
+ except Exception, e:
+ log.error("TimeFormatter: %s" % e)
+ log.debug(traceback.format_exc(e))
+
+ @staticmethod
+ def format_time(t):
+ """ do the format """
+ if not t:
+ return "Unknown"
+ return t.strftime(TimeFormatter.format)
+
+ @staticmethod
+ def calc_format(timeformat_settings, changed_key=None):
+ """ settings init or changed """
+ TimeFormatter.log.debug("Time Formatter: time format changed")
+ time_format = timeformat_settings.get_enum("time-format")
+
+ if time_format == TimeFormatter.SETTINGS_TIME_24_HOUR:
+ TimeFormatter.format = "%H:%M"
+
+ elif time_format == TimeFormatter.SETTINGS_TIME_12_HOUR:
+ TimeFormatter.format = "%I:%M %p"
+
+ elif time_format == TimeFormatter.SETTINGS_TIME_CUSTOM or time_format == TimeFormatter.SETTINGS_TIME_LOCALE:
+ # ignore this as it might contain date params
+ #TimeFormatter.format = gsettings.get_string("custom-time-format")
+ TimeFormatter.format = "%X"
+
+class NumberFormatter:
+ """
+ Formats a number with respect to the locale settings
+ """
+
+ # regex to remove trailing zeros
+ re_trailing_zeros = None
+ # regex to replace -0
+ re_minus_zero = re.compile("^-0$")
+
+ @staticmethod
+ def format_float(value, precision = 1):
+ """
+ Formats a float with current locale's conventions (decimal point &
+ grouping), with specified precision.
+ It strips trailing zeros after the decimal point and replaces -0 with 0.
+ """
+ p = int(precision)
+ v = float(value)
+ s = locale.format("%.*f", (p, v), True)
+ if p > 0:
+ # compile regex if needed
+ if NumberFormatter.re_trailing_zeros is None:
+ try: dp = locale.localeconv().get('decimal_point', '.')
+ except: dp = '.'
+ NumberFormatter.re_trailing_zeros = re.compile(dp + "?0+$")
+
+ s = NumberFormatter.re_trailing_zeros.sub('', s)
+ return NumberFormatter.re_minus_zero.sub('0', s)
=== added file 'indicator_weather/indicator_weatherconfig.py'
--- indicator_weather/indicator_weatherconfig.py 1970-01-01 00:00:00 +0000
+++ indicator_weather/indicator_weatherconfig.py 2013-05-18 18:22:26 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+### BEGIN LICENSE
+# Copyright (C) 2010 Sebastian MacDonald Sebas310@xxxxxxxxx
+# Copyright (C) 2010 Mehdi Rejraji mehd36@xxxxxxxxx
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+# THIS IS IndicatorWeather CONFIGURATION FILE
+# YOU CAN PUT THERE SOME GLOBAL VALUE
+# Do not touch unless you know what you're doing.
+# you're warned :)
+
+__all__ = [
+ 'project_path_not_found',
+ 'get_data_file',
+ 'get_data_path',
+ ]
+
+# Where your project will look for your data (for instance, images and ui
+# files). By default, this is ../data, relative your trunk layout
+__indicator_weather_data_directory__ = '../data'
+__license__ = 'GPL-3'
+
+import os
+
+import gettext
+from gettext import gettext as _
+gettext.textdomain('indicator-weather')
+
+class project_path_not_found(Exception):
+ """Raised when we can't find the project directory."""
+
+
+def get_data_file(*path_segments):
+ """Get the full path to a data file.
+
+ Returns the path to a file underneath the data directory (as defined by
+ `get_data_path`). Equivalent to os.path.join(get_data_path(),
+ *path_segments).
+ """
+ return os.path.join(get_data_path(), *path_segments)
+
+
+def get_data_path():
+ """Retrieve indicator-weather data path
+
+ This path is by default <indicator_weather_lib_path>/../data/ in trunk
+ and /usr/share/indicator-weather in an installed version but this path
+ is specified at installation time.
+ """
+
+ # Get pathname absolute or relative.
+ path = os.path.join(
+ os.path.dirname(__file__), __indicator_weather_data_directory__)
+
+ abs_data_path = os.path.abspath(path)
+ if not os.path.exists(abs_data_path):
+ raise project_path_not_found
+
+ return abs_data_path
=== modified file 'po/ar.po'
--- po/ar.po 2011-05-20 09:46:56 +0000
+++ po/ar.po 2013-05-18 18:22:26 +0000
@@ -6,15 +6,23 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-02-04 15:35+0000\n"
"Last-Translator: Reda Lazri (rAX) <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-08-22 14:12+0000\n"
+"Last-Translator: Nizar Kerkeni <nizarus@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Arabic <ar@xxxxxx>\n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-11 05:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
@@ -258,174 +266,580 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-08-23 05:47+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
+"Language: ar\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "توقعات الطقس لـ "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "مرتفع"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "منخفض"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "إنذار: طقس قاس"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Nizar Kerkeni https://launchpad.net/~nizarus";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "خطأ"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "إعداد الطقس..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "حول..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "تفضيلات..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "إنعاش"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "تحذير..."
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "لا تتوفر أية بيانات"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "توقعات..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "يُحدّث"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "يرجى الانتظار"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "الآن"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "منذ %d دقيقة"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "التسمية:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "درجة الحرارة:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr "مؤشر الحرارة:"
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr "مؤشر الحرارة"
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "درجة الحرارة والرطوبة"
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr "مؤشر الرطوبة:"
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr "مؤشر الرطوبة"
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr "درجة الحرارة والرطوبة (كندا)"
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "درجة الحرارة والرياح"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "تبدو كـ:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "تبدو كـ"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr "درجة الحرارة والرطوبة والرياح (استراليا)"
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "الندى:"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "الندى"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "الرطوبة:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "الرطوبة"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "مدى الرؤية:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "الرؤية"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "فقط من ياهو!"
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr "مقياس الضغط الجوي:"
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr "مقياس الضغط الجوي"
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "الرياح:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "الرياح"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "الشمس:"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "شمس"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr "الشروق و الغروب"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "الشروق:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "الشروق"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "الغروب:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "الغروب"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "الآن:"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "اليوم:"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
-msgstr ""
+msgstr "إعصار"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
-msgstr ""
+msgstr "عاصفة استوائية"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
-msgstr ""
+msgstr "إعصار مداري"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
-msgstr ""
+msgstr "عواصف رعدية شديدة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
-msgstr ""
+msgstr "عواصف رعدية"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
-msgstr ""
+msgstr "أمطار وثلوج مختلطة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
-msgstr ""
+msgstr "أمطار وصقيع مختلطة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
-msgstr ""
+msgstr "ثلوج وصقيع مختلطة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
-msgstr ""
+msgstr "رذاذ مجمِّد"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
-msgstr ""
+msgstr "رذاذ"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
-msgstr ""
+msgstr "مطر مجمِّد"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
-msgstr ""
+msgstr "زخات مطر"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
-msgstr ""
+msgstr "موجات ثلجية"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
-msgstr ""
+msgstr "زخات ثلوج خفيفة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
-msgstr ""
+msgstr "عاصفة ثلجية"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
-msgstr ""
+msgstr "ثلج"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
-msgstr ""
+msgstr "برد"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
-msgstr ""
+msgstr "مطر متجمد"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
-msgstr ""
+msgstr "غبار"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
-msgstr ""
+msgstr "ضبابي"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
-msgstr ""
+msgstr "سديم"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
-msgstr ""
+msgstr "داخن"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
-msgstr ""
+msgstr "عاصف"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
-msgstr ""
+msgstr "عاصف"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
-msgstr ""
+msgstr "بارد"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
-msgstr ""
+msgstr "غائِم"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
-msgstr ""
+msgstr "غائِم غالبا"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
-msgstr ""
+msgstr "غائِم جزئيًا"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
-msgstr ""
+msgstr "جلي"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "مشمس"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
-msgstr ""
+msgstr "معتدل"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
-msgstr ""
+msgstr "حار"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
-msgstr ""
+msgstr "عواصف رعدية معزولة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
-msgstr ""
+msgstr "عواصف رعدية متفرقة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
-msgstr ""
+msgstr "أمطار متفرقة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
-msgstr ""
+msgstr "ثلوج كثيفة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
-msgstr ""
+msgstr "زخات ثلوج متفرقة"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
-msgstr ""
+msgstr "زخات مطر رعدية"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
-msgstr ""
+msgstr "زخات ثلوج"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
+<<<<<<< TREE
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
@@ -433,7 +847,20 @@
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+msgstr "زخات مطر رعدية معزولة"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "حالة غير معروفة"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
+<<<<<<< TREE
msgstr ""
#: ../data/ui/Assistant.ui:35
@@ -453,14 +880,55 @@
msgstr ""
#: ../data/ui/Assistant.ui:137
+=======
+msgstr "أضف موقع"
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "الرجاء ابحث عن موقعك في قاعدة البيانات لدينا:"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "إبحث"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "انتق موقعاً"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "الرجاء إدخال اسم لهذا الموقع:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
msgid "Name the location"
+<<<<<<< TREE
msgstr ""
#: ../data/ui/Assistant.ui:151
+=======
+msgstr "اسم الموقع"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
+"الرجاء مراجعة الخيارات أدناه. إذا كان أي شيء غير صحيح، الرجاء العودة وتحديد "
+"الخيارات الصحيحة."
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>المنزل</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "المكان:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
@@ -476,6 +944,7 @@
#: ../data/ui/Assistant.ui:289
msgid "Review choices"
+<<<<<<< TREE
msgstr ""
#: ../data/ui/PreferencesDialog.ui:31
@@ -613,3 +1082,134 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr ""
+=======
+msgstr "راجع الخيارات"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "خيارات مؤشر الطقس"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr "<b>مؤشر</b>"
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "اعرض أيقونة الطقس فقط"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "اعرض درجة الحرارة فقط"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "اعرض أيقونة الطقس ودرجة الحرارة"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>التنبيهات</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "بدون إشعارات"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "استخدم فقط الإشعارات لإعطاء تنبيه الأحوال الجوية القاسية"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "استخدام الإشعارات لإعطاء كل تغيير في حالة الطقس"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "طبِّق لكافة المواقع"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>مصدر بيانات الطقس</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "جوجل"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "ياهوو!"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "حدّث كل"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "دقائق"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "عـام"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "اعرض التوقعات"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "اعرض الطقس لكافة المواقع"
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr "اخفِ الحقول غير ذات صلة"
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "قائمة"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>مقياس درجة الحرارة</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "فهرنهايت (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "درجة مئوية (°C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>وحدة سرعة الرياح</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "متر في الثانية (م/ث)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "ميلا في الساعة (ميل/س)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "كلم في الساعة (كلم/س)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "بيوفورت"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "عقد"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "الوحدات"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "المواقع"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/bg.po'
--- po/bg.po 2011-05-20 09:46:56 +0000
+++ po/bg.po 2013-05-18 18:22:26 +0000
@@ -6,18 +6,27 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-12 20:44+0000\n"
"Last-Translator: Svetoslav Stefanov <svetlisashkov@xxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-09-05 13:39+0000\n"
+"Last-Translator: Ивайло Маринков <ivo@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Bulgarian <bg@xxxxxx>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-13 14:33+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-09-06 05:04+0000\n"
+"X-Generator: Launchpad (build 13861)\n"
+"Language: bg\n"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/forecast.py:62
msgid "Weather Forecast for "
msgstr ""
@@ -258,174 +267,441 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Известявания</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Температурна скала</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Източник на данни за времето</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Мерна единица за скорост на вятъра</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Бофорт"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Влючване на Аплет-индикатор за времето"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Основни"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Империална (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr "Километра в час (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Възли"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Местоположения"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Метри в секунда (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Мили в час (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Без известявания"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+"Използване на известявания само за сериозни промени в състоянието на времето"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "Целзий (метрична, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr "Показвай температурата до указателя"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Единици"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Обновяване на всеки"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Използване на известявания за всяка промяна в състоянието на времето"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Настройка на индикатора за времето"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "минути"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr "Възникна неизвестна грешка при изискване данни за времето"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Торнадо"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Тропическа буря"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Ураган"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
-msgstr ""
+msgstr "Силни гръмотевични бури"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Гръмотевични бури"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
-msgstr ""
+msgstr "Дъжд и сняг"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
-msgstr ""
+msgstr "Дъжд и суграшица"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
-msgstr ""
+msgstr "Сняг и суграшица"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Ръмене със заледявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Ръмеж"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Дъжд със заледявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Превалявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
-msgstr ""
+msgstr "Снежни превалявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
-msgstr ""
+msgstr "Леки снежни превалявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
-msgstr ""
+msgstr "Снежна виелица"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Сняг"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Градушка"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Киша"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr "Прах"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Мъгливо"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr "Мараня"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
-msgstr ""
+msgstr "Замъглен"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
-msgstr ""
+msgstr "Бурен вятър"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Ветровито"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Студено"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Облачно"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Предимно облачно"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Частична облачност"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Ясно"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Слънчево"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
-msgstr "Предимно безоблачно"
+msgstr "Хубаво"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
-msgstr ""
+msgstr "Дъжд и градушка"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Горещо"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
-msgstr ""
+msgstr "Изолирани гръмотевични бури"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
-msgstr ""
+msgstr "Разпокъсани гръмотевични бури"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
-msgstr ""
+msgstr "Разпокъсани превалявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Тежък снеговалеж"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
-msgstr ""
+msgstr "Разпокъсани снежни превалявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
-msgstr ""
+msgstr "Гръмотевични бури с превалявания"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
-msgstr "Снеговалежи с прекъсвания"
+msgstr "Снеговалежи"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
+<<<<<<< TREE
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
@@ -433,6 +709,159 @@
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+msgstr "Изолирани гръмотевични бури с превалявания"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Неизвестно състояние"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Влажност"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Налягане"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Температура"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr "Неизвестен"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Вятър"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Изгрев"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Залез"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "С"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "СИ"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "И"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "ЮИ"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "Ю"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "ЮЗ"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "З"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "СЗ"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Настройка на времето..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Прогноза"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Настройки…"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "За програмата..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Обновяване, моля изчакайте"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Обновяване"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "току-що"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "преди %d мин."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Сигнал за лошо време"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Индикатор за времето"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Svetoslav Stefanov https://launchpad.net/~svetlisashkov\n";
+" Ивайло Маринков https://launchpad.net/~ivyl";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Прогноза за времето за "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Максимална"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Минимална"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Етикет:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Програмата е вече стартирана"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Дом</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Ориндж, Тексас</b>"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Добавяне на местоположение"
@@ -456,11 +885,25 @@
msgid "Name the location"
msgstr "Име на местоположението"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Моля въведете име за това местоположение:"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
+"Моля, прегледайте избраните опции по-долу. Ако нещо не е правилно, моля "
+"върнете се назад и изберете правилните опции."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Моля, потърсете в нашата база данни за вашето местоположение:"
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
@@ -476,8 +919,9 @@
#: ../data/ui/Assistant.ui:289
msgid "Review choices"
-msgstr ""
+msgstr "Преглед на опциите"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Настройка на индикатора за времето"
@@ -613,3 +1057,28 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Местоположения"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Търсене"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Избор на местоположение"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Подробна прогноза"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr "Времеви указател, показващ данни за едно или повече места по света"
+
+#~ msgid "Visibility"
+#~ msgstr "Видимост"
+
+#~ msgid "Humidex"
+#~ msgstr "Хюмидекс"
+>>>>>>> MERGE-SOURCE
=== added file 'po/ca.po'
--- po/ca.po 1970-01-01 00:00:00 +0000
+++ po/ca.po 2013-05-18 18:22:26 +0000
@@ -0,0 +1,487 @@
+# Catalan translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-09-05 10:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-06 05:04+0000\n"
+"X-Generator: Launchpad (build 13861)\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Notificacions</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Escala de temperatura</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "Font de la informació del temps"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Unitats de velocitat del vent</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Opcions generals"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Imperial (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Nusos"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Ubicacions"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metres per segon (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Milles per hora (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Sense notificacions"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Només utilitzeu les notificacions per donar alertes de mal temps"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metric, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unitats"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Actualitza cada"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+"Utilitza les notificacions per alertar qualsevol canvi en la condició del "
+"temps."
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Preferències de l'indicador del temps"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minuts"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr "Tornado"
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr "Tempesta tropical"
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr "Huracà"
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr "Tempestes de trons severes"
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr "Tempestes de trons"
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr "Pluja i neu"
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr "Pluja i calamarsa"
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr "Neu i calamarsa"
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr "Plugims gelats"
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr "Plugims"
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr "Pluja glaçada"
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr "Ruixats"
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr "Nevades lleugeres"
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr "Nevades lleugeres"
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr "Vent fort amb neu"
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr "Neu"
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr "Pedregada"
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr "Aiguaneu"
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr "Pols"
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr "Boira"
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr "Boirina"
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr "Boira espessa"
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr "Tempestuós"
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr "Ventós"
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr "Fred"
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr "Ennuvolat"
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr "Majorment ennuvolat"
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr "Parcialment ennuvolat"
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr "Assolellat"
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr "Assolellat"
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr ""
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr "Pluja i pedra"
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr "Calorós"
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr "Tempestes elèctriques aïllades"
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr "Tempestes elèctriques disperses"
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr "Ruixats dispersos"
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr "Nevades fortes"
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr "Nevades disperses"
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr "Tempestes de pluja"
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr "Nevades fortes"
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr "Tempestes de pluja aïllades"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Condició desconeguda"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Humitat"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr ""
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr ""
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vent"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Alba"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Ocàs"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr ""
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr ""
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr ""
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr ""
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Configurar el temps"
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr ""
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Preferències..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Quant a..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Actualitza"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "Ara mateix"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "fa %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerta de mal temps"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Pronòstic per "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etiqueta:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Inici</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr "Afegir una ubicació"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Ubicació:"
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr "Anomena la ubicació"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Siusplau, introdueix un nom per a aquesta ubicació:"
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+"Siusplau, revisa les opcions de sota. Si alguna cosa no és correcta, torna "
+"enrere i corregeix-ho."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Siusplau, cerca a la nostra base de dades la teva ubicació:"
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr "Revisar opcions"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Cerca:"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Seleccioneu una ubicació"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr ""
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+
+#~ msgid "Humidex"
+#~ msgstr "Temperatura de xafogor"
+
+#~ msgid "Visibility"
+#~ msgstr "Visibilitat"
=== modified file 'po/cs.po'
--- po/cs.po 2011-05-20 09:46:56 +0000
+++ po/cs.po 2013-05-18 18:22:26 +0000
@@ -6,15 +6,23 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-22 17:03+0000\n"
"Last-Translator: Zbyněk Schwarz <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-10-08 15:19+0000\n"
+"Last-Translator: Lukáš Chmela <lukaschmela@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Czech <cs@xxxxxx>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-23 06:00+0000\n"
"X-Generator: Launchpad (build 12758)\n"
@@ -258,174 +266,580 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-10-09 05:27+0000\n"
+"X-Generator: Launchpad (build 14110)\n"
+"Language: cs\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Předpověď pro "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Nejvyšší"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Nejnižší"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Vážná výstraha počasí"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Lukáš Chmela https://launchpad.net/~lukaschmela";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "Chyba"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Nastavit Počasí"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "O aplikaci..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Předvolby…"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Obnovit"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "Varování..."
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "Data nejsou k dispozici"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Předpověď..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Obnovování"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "prosím počkejte"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "právě teď"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "před %d min."
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Popisek:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Teplota:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr "Teplotní index:"
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr "Teplotní index"
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "Teplota a vlhkost"
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr "Pocitově:"
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr "Pocitově"
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr "V přímém větru:"
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr "V přímém větru"
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "Teplota a vítr"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Pocitově:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Pocitově"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Rosný bod:"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Rosný bod"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Vlhkost:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Vlhkost"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Viditelnost:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Viditelnost"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "Pouze z Yahoo!"
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr "Barometr:"
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr "Barometr"
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "Vítr:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vítr"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "Slunce:"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Slunečno"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr "Východ a západ slunce"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Východ slunce:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Východ slunce"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Západ slunce:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Západ slunce"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "Teď:"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "Dnes:"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Tornádo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Tropická bouře"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Hurikán"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
-msgstr "Silné Bouře"
+msgstr "Silné bouřky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Bouřky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
-msgstr "Smíšený dešť a sníh"
+msgstr "Smíšený déšť se sněhem"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr "Smíšený déšť a plískanice"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr "Smíšený sníh a plískanice"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Mrznoucí mrholení"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Mrholení"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Mrznoucí déšť"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Dešťové přeháňky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
-msgstr "Příval sněhu"
+msgstr "Přívaly sněhu"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr "Lehké sněhové přeháňky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
-msgstr "Navátý sníh"
+msgstr "Zvířený sníh"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Sníh"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Krupobití"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Plískanice"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr "Prach"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Mlhavo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
-msgstr "Lehká mlha"
+msgstr "Opar"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr "Zakouřeno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr "Vichrno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Větrno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Chladno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Oblačno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Skoro zataženo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Polojasno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Jasno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Slunečno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
msgstr "Polojasno"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr "Smíšený déšť a kroupy"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Horko"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr "Izolované bouřky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Rozptýlené bouřky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Rozptýlené přeháňky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
-msgstr "Vydatný sníh"
+msgstr "Vánice"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Rozptýlené sněhové přeháňky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
-msgstr "Krátké bouře"
+msgstr "Krátké bouřky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Sněhové přeháňky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
+<<<<<<< TREE
msgstr "Izolované krátké bouře"
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
@@ -433,9 +847,22 @@
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+msgstr "Izolované krátké bouřky"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Neznámé podmínky"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Přidat umístění"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:35
msgid "Please search our database for your location:"
msgstr ""
@@ -453,16 +880,53 @@
msgstr "Prosím, zadejte jméno polohy:"
#: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Vyhledejte prosím své umístění v naší databízi:"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Hledat"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Vyberte umístění"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Zadejte prosím název pro toto umístění:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
msgid "Name the location"
+<<<<<<< TREE
msgstr "Pojmenujte polohu"
#: ../data/ui/Assistant.ui:151
+=======
+msgstr "Pojmenujte umístění"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
-"Prosím, zkontrolujte volby níže. Pokud je něco v nepořádku, vraťte se a "
-"zvolte správné volby."
+"Zkontrolujte prosím volby níže. Pokud některá není správně, vraťte se prosím "
+"a vyberte správnou volbu."
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Domů</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Umístění:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
@@ -478,6 +942,7 @@
#: ../data/ui/Assistant.ui:289
msgid "Review choices"
+<<<<<<< TREE
msgstr "Zkontrolovat volby"
#: ../data/ui/PreferencesDialog.ui:31
@@ -615,3 +1080,134 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Umístění"
+=======
+msgstr "Zkontrolujte volby"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Nastavení indikátoru počasí"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr "<b>Indikátor</b>"
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "Zobrazit pouze ikonu počasí"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Zobrazit pouze teplotu"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "Zobrazit ikonu počasí a teplotu"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Upozornění</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Žádná upozornění"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Použít upozornění pouze pro závažné výstrahy"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Použít upozornění pro jakoukoli změnu podmínek"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "Použít pro všechna umístění"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Zdroj dat o počasí</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Aktualizovat každých"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minut"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Obecné"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "Zobrazit předpověď"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "Zobrazit počasí pro všechna umístění"
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr "Skrýt nedůležitá pole"
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr "Zobrazit tato pole"
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Teplotní stupnice</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Imperiální (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrická, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Jednotka rychlosti větru</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metry za sekundu (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Míle za hodinu (mph)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "Kilometry za hodinu (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Uzly"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Jednotky"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Umístění"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/da.po'
--- po/da.po 2011-05-20 09:46:56 +0000
+++ po/da.po 2013-05-18 18:22:26 +0000
@@ -6,18 +6,27 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-12 15:20+0000\n"
"Last-Translator: Anders G. Jørgensen <spirit55555@xxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-08-13 12:19+0000\n"
+"Last-Translator: Anders Feder <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Danish <da@xxxxxx>\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-13 14:33+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-08-14 05:13+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
+"Language: da\n"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/forecast.py:62
msgid "Weather Forecast for "
msgstr ""
@@ -258,184 +267,602 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Påmindelser</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Temperaturskala</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Vejrdatakilda</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Slå vejrindikator til"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Generelt"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Engelsk (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr "Km i timen (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Knob"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Lokaliteter"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Meter i sekundet (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Miles i timen (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Ingen påmindelser"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Giv kun påmindelser for alvorlige vejrvarsler"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrisk, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr "Vis temperatur nær indikator"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Enheder"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Opdatér hver"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Giv påmindelser for enhver ændring i vejrforhold"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minut"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr "Ukendt fejl ved indlæsning af vejrdata"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Tornado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Tropisk storm"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Orkan"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
-msgstr ""
+msgstr "Alvorlig tordenvejr"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Tordenvejr"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr "Blandet regn og sne"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
-msgstr ""
+msgstr "Blandet regn og slud"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
-msgstr ""
+msgstr "Blandet sne og slud"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
-msgstr ""
+msgstr "Isslag"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
-msgstr ""
+msgstr "Støvregn"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Isslag"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Regnbyger"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
-msgstr ""
+msgstr "Snebyge"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
-msgstr ""
+msgstr "Let sne"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
-msgstr ""
+msgstr "Snefygning"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Sne"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Hagl"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Slud"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
-msgstr ""
+msgstr "Støv"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Tåget"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
-msgstr ""
+msgstr "Dis"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
-msgstr ""
+msgstr "Tilrøget"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
-msgstr ""
+msgstr "Blæsende"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Blæsende"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Koldt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Overskyet"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
-msgstr ""
+msgstr "Mest skyet"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
-msgstr ""
+msgstr "Delvis skyet"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Klart"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Solrigt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
-msgstr ""
+msgstr "Rimelig"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
-msgstr ""
+msgstr "Blandet regn og hagl"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Varmt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
-msgstr ""
+msgstr "Kraftig sne"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
-msgstr ""
+msgstr "Snebyger"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr ""
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Luftfugtighed"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Tryk"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Temperatur"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vind"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Solopgang"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Solnedgang"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "N"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "NØ"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "Ø"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "SØ"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "S"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "SV"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "V"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "NV"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Indstil vejrindikator..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Prognose"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Indstillinger..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Om..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Opdater"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "lige nu"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. siden"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alvorligt vejrvarsel"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Vejrindikator"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Anders Feder https://launchpad.net/~anders-feder\n";
+" Anders G. Jørgensen https://launchpad.net/~spirit55555";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Vejrudsigt for "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Høj"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Lav"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etiket:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "En anden instans af dette program kører allerede"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Hjem</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
-msgstr ""
+msgstr "Tilføj en lokalitet"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:35
msgid "Please search our database for your location:"
msgstr ""
@@ -453,15 +880,31 @@
msgstr ""
#: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Lokalitet"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
msgid "Name the location"
-msgstr ""
+msgstr "Navngiv lokaliteten"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Indtast venligst et navn for denne lokalitet:"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
msgstr ""
@@ -475,9 +918,17 @@
msgstr ""
#: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Find venligst din lokalitet i vores database:"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
msgid "Review choices"
msgstr ""
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr ""
@@ -613,3 +1064,29 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Lokaliteter"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Søg"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Vælg en lokalitet"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Forlænget prognose"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"En vejrindikator der viser information for et eller flere steder i verden"
+
+#~ msgid "Humidex"
+#~ msgstr "Humidex"
+
+#~ msgid "Visibility"
+#~ msgstr "Synlighed"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/de.po'
--- po/de.po 2011-05-20 09:46:56 +0000
+++ po/de.po 2013-05-18 18:22:26 +0000
@@ -6,15 +6,23 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-09 13:27+0000\n"
"Last-Translator: Matthias Loidolt <kedapperdrake@xxxxxxxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-11-13 20:33+0000\n"
+"Last-Translator: Alexander Berndsen <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-10 05:59+0000\n"
"X-Generator: Launchpad (build 12735)\n"
@@ -258,184 +266,605 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-11-14 05:30+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+"Language: de\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Wettervorhersage für "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Hoch"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Niedrig"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Unwetterwarnung"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Henrik Graßhoff https://launchpad.net/~henrik-grasshoff\n";
+" TIℳ㋡ https://launchpad.net/~tim.h.s\n";
+" Till Lorentzen https://launchpad.net/~tilllor\n";
+" Vadim Rutkovsky https://launchpad.net/~roignac\n";
+" axoin https://launchpad.net/~axoin";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "Fehler"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Wetter einrichten …"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Über …"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Einstellungen …"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "Warnung …"
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "Keine Daten verfügbar"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Wettervorhersage..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Aktualisiere"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "bitte warten"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "gerade eben"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "vor %d Minuten"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Schlagwort:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Temperatur:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr "Hitzeindex:"
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr "Hitzeindex"
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "Temperatur und Luftfeuchtigkeit"
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr "Hitzeindex:"
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr "Hitzeindex"
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr "Temperatur und Luftfeuchtigkeit (Kanada)"
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr "Windchill:"
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr "Windchill"
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "Temperatur und Windrichtung"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Gefühlt:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Gefühlt"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr "Hitzeindex oder Windchill"
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr "gefühlte (CA):"
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr "gefühlte (CA):"
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr "Hitzeindex oder Windchill (Kanada)"
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr "gefühlte (AU):"
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr "gefühlte (AU):"
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr "Temperatur, Luftfeuchte und Windrichtung (Australien)"
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Taupunkt"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Taupunkt"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Luftfeuchtigkeit:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Luftfeuchtigkeit"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Sicht:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Sicht"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "Nur von Yahoo!"
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr "Barometer:"
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr "Barometer"
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "Windrichtung"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Wind"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "Sonne:"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Sonne"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr "Sonnenauf- und untergang"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Sonnenaufgang:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Sonnenaufgang"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Sonnenuntergang:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Sonnenuntergang"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "Jetzt"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "Heute:"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Tornado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Tropischer Sturm"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Wirbelsturm"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
-msgstr "starke Gewitter"
+msgstr "Starke Gewitter"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Gewitter"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr "Regen und Schnee"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr "Regen und Graupel"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr "Schnee und Graupel"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Gefrierender Nieselregen"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Nieselregen"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Gefrierender Regen"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Schauer"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
msgstr "Schneegestöber"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr "Leichte Schneeschauer"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
msgstr "Schneetreiben"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Schnee"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Hagel"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Graupel"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr "Staub"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Nebelig"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr "Diesig"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr "Dunstig"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr "Stürmisch"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Windig"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Kalt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Bewölkt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
-msgstr "Meist Bewölkt"
+msgstr "Meist bewölkt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
-msgstr "Teilweise Bewölkt"
+msgstr "Teilweise bewölkt"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Klar"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Sonnig"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
msgstr "Heiter"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr "Regen und Hagel"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Heiß"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr "Vereinzelt Gewitter"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Vereinzelt Gewitter"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Vereinzelt Regenschauer"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Schwerer Schneefall"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Vereinzelt Schneefall"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr "Gewitterschauer"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Schneeschauer"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr "Vereinzelte Gewitterschauer"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Unbekannte Bedingungen"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Ort hinzufügen"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:35
msgid "Please search our database for your location:"
msgstr ""
@@ -455,14 +884,51 @@
#: ../data/ui/Assistant.ui:137
msgid "Name the location"
msgstr "Nenne den Ort"
-
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Bitte durchsuchen Sie unsere Datenbank nach Ihrem Standort"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Suchen"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Einen Ort wählen"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Bitte geben Sie einen Namen für den Ort ein:"
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr "Den Ort benennen"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
"Bitte überprüfen Sie die folgenden Angaben. Sollten Sie einen Fehler "
-"entdecken können Sie zurück gehen, um die Auswahl zu korrigieren."
+"entdecken, können Sie zurückgehen, um die Auswahl zu korrigieren."
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Wohnort</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Ort:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
@@ -480,6 +946,7 @@
msgid "Review choices"
msgstr "Auswahl überprüfen"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Wetterindikator-Einstellungen"
@@ -615,3 +1082,132 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Orte"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Wetterindikator-Einstellungen"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr "<b>Anzeige</b>"
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "Zeige nur das Symbol"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Zeige nur Temperatur"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "Zeige Wettersymbol und Temperatur"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Benachrichtigungen</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Keine Benachrichtigungen"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Benachrichtigungen nur verwenden, um Unwetterwarnungen anzuzeigen"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Benachrichtigungen für jede Wetteränderung anzeigen"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "Auf alle Orte anwenden"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Quelle für Wetterdaten</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Aktualisieren alle"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "Minuten"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Allgemein"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "Zeige Vorhersage"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "Zeige das Wetter für alle Orte"
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr "Verstecke irrelevante Felder"
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr "Wetterbericht-Felder zum Anzeigen"
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "Menü"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Temperaturskala</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Fahrenheit (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrisch, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Einheit für Windgeschwindigkeiten</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Meter pro Sekunde (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Meilen pro Stunde (mph)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "Km pro Stunde (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Knoten"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Einheiten"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Orte"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/el.po'
--- po/el.po 2011-05-20 09:46:56 +0000
+++ po/el.po 2013-05-18 18:22:26 +0000
@@ -6,18 +6,27 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-18 23:58+0000\n"
"Last-Translator: Panagiotis Skintzos <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-05-19 00:22+0000\n"
+"Last-Translator: Renji NsK <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Greek <el@xxxxxx>\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-23 05:53+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: el\n"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/forecast.py:62
msgid "Weather Forecast for "
msgstr "Πρόγνωση καιρού για "
@@ -258,179 +267,586 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Ειδοποιήσεις</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Κλίμακα θερμοκρασίας</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Πηγή δεδομένων καιρού</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Μονάδα ταχύτητας ανέμου</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Μποφόρ"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Ενεργοποίηση του Δείκτη Καιρού"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Γενικά"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Αγγλοσαξωνικό σύστημα (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Κόμβοι"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Τοποθεσίες"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Μέτρα ανά δευτερόλεπτο (μ/δ)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Μίλια ανά ώρα (μ/ω)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Όχι ειδοποιήσεις"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Ειδοποιήσεις μόνο για αντίξοες καιρικές συνθήκες"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "Διεθνές Σύστημα Μονάδων (μετρικό, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Μονάδες"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Ενημέρωση κάθε"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Ειδοποιήσεις για κάθε αλλαγή του καιρού"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Προτιμήσεις Δείκτη Καιρού"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "λεπτά"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Ανεμοστρόβιλος"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Τροπική καταιγίδα"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Θύελλα"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
msgstr "Σφοδρές καταιγίδες"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Καταιγίδες"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr "Μικτή βροχή και χιόνι"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr "Μικτή βροχή και χιονόνερο"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr "Μικτό χιόνι και χιονόνερο"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Παγωμένο ψιχάλισμα"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Ψιχάλισμα"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Παγωμένη βροχή"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Μπόρα"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
-msgstr ""
+msgstr "Πιθανές Χιονοπτώσεις"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr "Ελαφρά χιονόπτωση"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
msgstr "Δυνατή χιονόπτωση"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Χιονόπτωση"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Χαλάζι"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Χιονόνερο"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr "Σκόνη"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Ομιχλώδης"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr "Καταχνιά"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Aνεμώδης"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Ψυχρός"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Συννεφιά"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Κυρίως συννεφιά"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Μερική συννεφιά"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Καθαρός"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Λιακάδα"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
msgstr "Αίθριος"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr "Μικτή βροχή και χαλάζι"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Ζεστός"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr "Τοπικές καταιγίδες"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Διάσπαρτες καταιγίδες"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Διάσπαρτες βροχοπτώσεις"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Έντονη χιονόπτωση"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Διάσπαρτες μπόρες χιονιού"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
-msgstr ""
+msgstr "Καταιγίδες"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Μπόρες χιονιού"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
+msgstr "Τοπικές καταιγίδες"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
+=======
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Υγρασία"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Πίεση"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Θερμοκρασία"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Άνεμος"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Ανατολή"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Δύση"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "Β"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "ΒΑ"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "Α"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "ΝΑ"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "Ν"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "ΝΔ"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "Δ"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "ΒΔ"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Ρυθμίσεις καιρού..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Πρόγνωση"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Προτιμήσεις…"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Περί..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Ανανέωση, παρακαλώ περιμένετε"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "τώρα"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "πρίν %d λεπτά"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Προειδοποίηση κακοκαιρίας"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Δείκτης Καιρού"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Panagiotis Skintzos https://launchpad.net/~ph7\n";
+" Renji NsK https://launchpad.net/~redarmy-2505";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Πρόγνωση καιρού για "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Υψηλή"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Χαμηλή"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Ετικέτα:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Το πρόγραμμα αυτό εκτελείται ήδη"
+>>>>>>> MERGE-SOURCE
#: ../data/ui/Assistant.ui:10
msgid "Add a location"
@@ -456,7 +872,15 @@
msgid "Name the location"
msgstr "Ονομασία τοποθεσίας"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Παρακαλώ εισάγετε ένα όνομα για αυτήν την τοποθεσία:"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
@@ -464,6 +888,7 @@
"Παρακαλώ εξετάστε τις παρακάτω επιλογές. Αν κάτι δεν είναι σωστό, πηγαίνετε "
"πίσω και επιλέξτε τις σωστές επιλογές."
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
msgstr "<b>Οικία</b>"
@@ -477,9 +902,17 @@
msgstr "<b>Orange, Texas</b>"
#: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Παρακαλούμε αναζητήστε στη βάση δεδομένων μας για την τοποθεσία σας:"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
msgid "Review choices"
msgstr "Επανεξέταση επιλογών"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Προτιμήσεις Δείκτη Καιρού"
@@ -615,3 +1048,64 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Τοποθεσίες"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Επιλογή τοποθεσίας"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Εκτεταμένη πρόγνωση"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Ένας δείκτης καιρού που εμφανίζει πληροφορίες για ένα ή πολλά σημεία του "
+"κόσμου"
+
+#~ msgid "mph"
+#~ msgstr "μ/ω"
+
+#~ msgid "km/h"
+#~ msgstr "χλμ/ω"
+
+#~ msgid "m/s"
+#~ msgstr "μ/δ"
+
+#~ msgid "Kilometers per hour (kph)"
+#~ msgstr "Χιλιόμετρα ανά ώρα (χ/ω)"
+
+#~ msgid "SI (°C)"
+#~ msgstr "Διεθνές σύστημα μονάδων (°C)"
+
+#~ msgid "Please input a location in the combobox below:"
+#~ msgstr "Παρακαλώ εισάγετε μια τοποθεσία στο παρακάτω πεδίο:"
+
+#~ msgid "refreshed just now"
+#~ msgstr "ανανεώθηκε μόλις τώρα"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "τελευταία ανανέωση πριν %s λεπτά"
+
+#~ msgid "last refreshed just now"
+#~ msgstr "Ανανεώθηκε μόλις τώρα"
+
+#~ msgid "Show tips in menu"
+#~ msgstr "Εμφάνιση συμβουλών στο μενού"
+
+#~ msgid "knot(s)"
+#~ msgstr "κόμβος;κόμβοι"
+
+#~ msgid "Visibility"
+#~ msgstr "Ορατότητα"
+
+#~ msgid "Humidex"
+#~ msgstr "Δείκτης υγρασίας"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/eo.po'
--- po/eo.po 2011-05-20 09:46:56 +0000
+++ po/eo.po 2013-05-18 18:22:26 +0000
@@ -6,15 +6,22 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-03 19:03+0000\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-10-17 06:34+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Michael Moroni <michael.moroni@xxxxxxxxxx>\n"
"Language-Team: Esperanto <eo@xxxxxx>\n"
"Language: eo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 05:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
@@ -258,184 +265,601 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-10-18 05:04+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
+"Language: eo\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr ""
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Alta"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Malalta"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Guybrush88 https://launchpad.net/~guybrush";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "eraro"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr ""
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Pri..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Agordoj..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Aktualigi"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr ""
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr ""
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etikedo:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Temperaturo:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Sentas kiel:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Sentas kiel"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Humideco:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Humideco"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Videbleco:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Videbleco"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "Vento:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vento"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "Dim:"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Dim"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Sunleviĝo:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Sunleviĝo"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Sunsubiro:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Sunsubiro"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
-msgstr ""
+msgstr "Ciklono"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
-msgstr ""
+msgstr "Glaciigita pluveto"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
-msgstr ""
+msgstr "Pluveto"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
-msgstr ""
+msgstr "Glaciigita pluvo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
-msgstr ""
+msgstr "Neĝo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
-msgstr ""
+msgstr "Hajlo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
-msgstr ""
+msgstr "Neĝo kaj Pluvo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
-msgstr ""
+msgstr "Polvo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
-msgstr ""
+msgstr "Brumo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
-msgstr ""
+msgstr "Venta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
-msgstr ""
+msgstr "Venta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
-msgstr ""
+msgstr "Malvarma"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
-msgstr ""
+msgstr "Nuba"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
-msgstr ""
+msgstr "Vakigi"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
-msgstr ""
+msgstr "Suna"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
-msgstr ""
+msgstr "Akceptebla"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
-msgstr ""
+msgstr "Varma"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
-msgstr ""
+msgstr "Peza neĝo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
-msgstr ""
+msgstr "Interrompita neĝo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr ""
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:35
msgid "Please search our database for your location:"
msgstr ""
@@ -453,15 +877,39 @@
msgstr ""
#: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Elekti lokon"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
msgid "Name the location"
msgstr ""
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
msgstr ""
@@ -475,9 +923,25 @@
msgstr ""
#: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Hejmo</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Loko:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
msgid "Review choices"
msgstr ""
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr ""
@@ -613,3 +1077,132 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Lokoj"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Atentigoj</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Guglo"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutoj"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Ĝenerala"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "Menua"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unitoj"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Lokoj"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/es.po'
--- po/es.po 2011-05-20 09:46:56 +0000
+++ po/es.po 2013-05-18 18:22:26 +0000
@@ -6,15 +6,23 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-12 17:01+0000\n"
"Last-Translator: Gonzalo Bulnes Guilpain <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-09-20 14:28+0000\n"
+"Last-Translator: A. Belén López Garello <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Spanish <es@xxxxxx>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-13 14:33+0000\n"
"X-Generator: Launchpad (build 12735)\n"
@@ -258,184 +266,603 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-09-21 05:26+0000\n"
+"X-Generator: Launchpad (build 13996)\n"
+"Language: es\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Pronóstico para "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Alta"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Baja"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerta de mal tiempo"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" A. Belén López Garello https://launchpad.net/~belen.lg\n";
+" Fitoschido https://launchpad.net/~fitoschido\n";
+" Paco Molinero https://launchpad.net/~franciscomol";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "error"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Configurar el clima..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Acerca de..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Preferencias..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "Aviso..."
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "No hay datos disponibles"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Pronóstico..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Actualizando"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "espere"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "justo ahora"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "hace %d min."
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etiqueta:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Temperatura:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr "índice de calor:"
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr "Índice de calor"
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "Temperatura y humedad"
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr "Humidex:"
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr "Humidex"
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr "Temperatura y humedad (Canadá)"
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr "Sensación térmica:"
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr "Sensación térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "Temperatura y viento"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Sensación térmica:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Sensación térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr "Índice de calor o sensación térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr "Sensación térmica (CA):"
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr "Sensación térmica (CA)"
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr "Humidex o sensación térmica (Canada)"
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr "Sensación térmica (AU):"
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr "Sensación térmica (AU)"
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr "Tmperatura, humedad y viento (Australia)"
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Punto de rocío:"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Punto de rocío"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Humedad:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Humedad"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Visibilidad:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "De Yahoo!"
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr "Barómetro:"
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr "Barómetro"
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "Viento:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Viento"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "Sol:"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Sol"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr "Amanecer y atardecer"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Amanecer:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Amanecer"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Ocaso:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Ocaso"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "Ahora:"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "Hoy:"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Tornado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
-msgstr "Tormenta Tropical"
+msgstr "Tormenta tropical"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Huracán"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
msgstr "Tormentas eléctricas severas"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Tormentas eléctricas"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
-msgstr "Mezcla de agua y nieve"
+msgstr "Mezcla de lluvia y nieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr "Mezcla de lluvia y aguanieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr "Mezcla de nieve y aguanieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Llovizna helada"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Llovizna"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Lluvia helada"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Chaparrones"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
msgstr "Ráfagas de nieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr "Lluvia de nieve ligera"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
msgstr "Nieve soplante"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Nieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Granizo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Aguanieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr "Polvo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Neblina"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr "Bruma"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr "humoso"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr "Borrascoso"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Ventoso"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Frío"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Nublado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Mayormente nublado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Parcialmente nublado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Despejado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Soleado"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
-msgstr "Limpio"
+msgstr "Buen tiempo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr "Mezcla de lluvia y granizo"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
-msgstr "Caliente"
+msgstr "Calor"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr "Tormentas eléctricas aisladas"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Tormentas eléctricas dispersas"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Lluvias dispersas"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Nieve abundante"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Nevadas aisladas"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr "Lluvias con truenos"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Aguanieve"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr "Lluvias con truenos aislados"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Condición desconocida"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Añadir una ubicación"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:35
msgid "Please search our database for your location:"
msgstr ""
@@ -453,10 +880,33 @@
msgstr "Introduzca un nombre para esta ubicación:"
#: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Busque su ubicación en nuestra base de datos:"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Buscar"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Seleccione una ubicación"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Introduzca un nombre para esta ubicación:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
msgid "Name the location"
msgstr "Nombre la ubicación"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
@@ -464,6 +914,7 @@
"Por favor verifique las elecciones debajo. Si algo no esta correcto, por "
"favor regrese y seleccione las opciones correctas."
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
msgstr "<b>Domicilio</b>"
@@ -477,9 +928,25 @@
msgstr "<b>Orange, Texas</b>"
#: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Domicilio</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Ubicación:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
msgid "Review choices"
msgstr "Verifique opciones"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Preferencias del indicador del clima"
@@ -617,3 +1084,134 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Localización"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Preferencias del indicador del clima"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr "<b>Indicador</b>"
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "Solo mostrar icono de clima"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Solo mostrar temperatura"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "Mostrar icono de clima y temperatura"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Notificaciones</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Sin notificaciones"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+"Usar las notificaciones solamente para alertar sobre condiciones climáticas "
+"severas"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Usar notificaciones para informar sobre cualquier cambio en el clima"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "Aplicar a todas las ubicaciones"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Fuente de datos de clima</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Actualizar cada"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutos"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "General"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "Mostrar pronóstico"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "Mostrar clima para todas las ubicaciones"
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr "Ocultar campos irrelevantes"
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr "Campos del informe meteorológico a mostrar"
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "Menú"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Escala de temperatura</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Imperial (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (métrico, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Unidad de velocidad del viento</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metros por segundo (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Millas por hora (mph)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "Km por hora (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Nudos"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unidades"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Ubicaciones"
+>>>>>>> MERGE-SOURCE
=== added file 'po/et.po'
--- po/et.po 1970-01-01 00:00:00 +0000
+++ po/et.po 2013-05-18 18:22:26 +0000
@@ -0,0 +1,605 @@
+# Estonian translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-10-24 08:12+0000\n"
+"Last-Translator: Valju <Unknown>\n"
+"Language-Team: Estonian <et@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-10-25 05:05+0000\n"
+"X-Generator: Launchpad (build 14185)\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Ilmaennustus asukohale "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Kõrge"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Madal"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Ränga ilma hoiatus"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Jalakas https://launchpad.net/~jalakas\n";
+" Valju https://launchpad.net/~valju\n";
+" tabbernuk https://launchpad.net/~boamaod";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "tõrge"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Ilma seadistamine..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Teave..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Eelistused..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Värskenda"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "Hoiatus..."
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "Andmed puuduvad"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Ennustus..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Värskendamine"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "palun, oota"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "just praegu"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. eest"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Pealkiri:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Temperatuur:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr "Kuumuseindeks:"
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr "Kuumuseindeks"
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "Temperatuur ja niiskus"
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr "Niiskusindeks:"
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr "Niiskusindeks"
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr "Temperatuur ja niiskus (Kanada)"
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr "Tuulekülm:"
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr "Tuulekülm"
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "Temperatuur ja tuul"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Tundub nagu:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Tundub nagu"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr "Kuumaindeks või tuulekülm"
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr "Tundub nagu (CA):"
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr "Tundub nagu (CA)"
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr "Niiskusindeks ja tuulekülm (Kanada)"
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr "Tundub nagu (AU):"
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr "Tundub nagu (AU)"
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr "Temperatuur, niiskus ja tuul (Austraalia)"
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Kastepunkt:"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Kastepunkt"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Niiskus:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Niiskus"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Nähtavus:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Nähtavus"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "Ainult Yahoo!-st"
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr "Õhurõhk:"
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr "Õhurõhk"
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "Tuul:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Tuul"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "Päike:"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Päike"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr "Päikesetõus ja -loojang"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Päikesetõus:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Päikesetõus"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Päikeseloojang:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Päikeseloojang"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "Hetkel:"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "Täna:"
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr "Tornaado"
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr "Troopiline torm"
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr "Orkaan"
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr "Ränk äikesetorm"
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr "Äikesetorm"
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr "Vihm ja lumi"
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr "Vihm ja lörts"
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr "Lumi ja lörts"
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr "Jäätuv uduvihm"
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr "Uduvihm"
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr "Jäätuv vihm"
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr "Hoovihm"
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr "Lumeudu"
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr "Kerged lumehood"
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr "Tuisk"
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr "Lumesadu"
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr "Rahe"
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr "Lörts"
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr "Tolm"
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr "Udune"
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr "Sudu"
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr "Suitsune"
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr "Tormine"
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr "Tuuline"
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr "Külm"
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr "Pilvine"
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr "Peamiselt pilves"
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr "Osaliselt pilves"
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr "Selge"
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr "Päikseline"
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr "Selge"
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr "Vihm ja rahe"
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr "Palav"
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr "Eraldi äiksetormid"
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr "Pillutatud äiksetormid"
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr "Pillutatud hoovihmad"
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr "Tugev lumesadu"
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr "Pillutatud hootised lumesajud"
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr "Hootised äikesevihmad"
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr "Hootised lumesajud"
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr "Eraldi hootsed äikesevihmad"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Määratletata seisund"
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr "Asukoha lisamine"
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Palun, otsi oma asukohta meie andmebaasist:"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Otsing"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Vali asukoht"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Palun sisesta selle koha nimi:"
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr "Nimeta asukoht"
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+"Palun kontrolli järgnevaid valikuid. Kui midagi on vale, mine tagasi ja vali "
+"õiged valikud."
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Kodu</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Asukoht:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr "Valikute läbivaatamine"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Ilmanäidiku eelistused"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr "<b>Näidik</b>"
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "Ainult ilmaikooni näitamine"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Ainult temperatuuri näitamine"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "Ilmaikooni ja temperatuuri näitamine"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Teavitused</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Ilma teavitusteta"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Kasuta teavitusi vaid tõsiste ilmahoiatuste korral"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Kasuta teavitusi iga ilmastikutingimuse muutuse korral"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "Rakenda kõigile asukohtadele"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Ilmaandmete allikas</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Uuendamise intervall"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minut(it)"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Üldist"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "Ennustuse näitamine"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "Näita kõikide kohtade ilma"
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr "Asjassepuutumatute väljade peitmine"
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr "Näita ilmateate väljasid"
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "Menüü"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Temperatuuriühik</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Inglise (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (meeter, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Tuulekiiruse ühik</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Meetrit sekundis (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Miili tunnis (mph)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "Kilomeetrit tunnis (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Sõlmed"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Ühikud"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Asukohad"
=== added file 'po/eu.po'
--- po/eu.po 1970-01-01 00:00:00 +0000
+++ po/eu.po 2013-05-18 18:22:26 +0000
@@ -0,0 +1,485 @@
+# Basque translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-11-02 23:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque <eu@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-04 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Jakinarazpenak</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Tenperatura Eskala</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Eguraldi datuen jatorria</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Haizearen Abiadura Unitatea</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Orokorra"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Inperiala (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Korapiloak"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Kokalekuak"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metro segunduko (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Milia orduko (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Jakinarazpenik ez"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Erabili jakinarazpenak soilik eguraldi txar alertetarako"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrikoa, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unitateak"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Eguneratu"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Erabili jakinarazpenak eguraldiaren edozein aldaketa jakinarazteko"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Eguraldi Adierazlearen Hobespenak"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minututik behin"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr "Tornadoa"
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr "Ekaitz tropikala"
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr "Urakana"
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr "Trumoi-ekaitz gogorrak"
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr "Trumoi-ekaitzak"
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr "Euria eta elurra"
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr "Euria eta elurbustia"
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr "Elurra eta elurbustia"
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr "Zirimiri izoztua"
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr "Zirimiria"
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr "Euri izoztua"
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr "Zaparradak"
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr "Elur-jasak"
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr "Elur zaparrada arinak"
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr "Elur-jasa haizetsua"
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr "Elurra"
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr "Kazkabarra"
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr "Elurbustia"
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr "Hautsa"
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr "Lainotsua"
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr "Gandua"
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr "Ketsua"
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr "Ekaiztsu"
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr "Haizetsua"
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr "Hotza"
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr "Hodeitsua"
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr "Nagusiki hodeitsua"
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr "Nahiko hodeitsua"
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr "Oskarbi"
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr "Eguzkitsua"
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr "Ederra"
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr "Euria eta kazkabarra"
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr "Beroa"
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr "Trumoi-ekaitz isolatuak"
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr "Trumoi-ekaitz sakabanatuak"
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr "Zaparrada sakabanatuak"
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr "Elur-jasa"
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr "Elur zaparrada sakabanatuak"
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr "Zaparrada ekaiztsuak"
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr "Elur zaparradak"
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr "Zaparrada ekaiztsu sakabanatuak"
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Egoera ezezaguna"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Hezetasuna"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr ""
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr ""
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Haizea"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Egunsentia"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Ilunsentia"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr ""
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr ""
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr ""
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr ""
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Ezarri Eguraldia..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr ""
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Hobespenak..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Honi buruz..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Freskatu"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "oraintxe bertan"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "duela %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerta eguraldi txarra dela eta"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Eguraldi Iragarpena: "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Altua"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Baxua"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etiketa:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Etxea</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr "Gehitu kokaleku bat"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Kokalekua"
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr "Kokalekua izendatu"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Sartu kokaleku honen izena:"
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+"Mesedez ikuskatu beheko aukerak. Zerbait ez badago ondo, mesedez itzuli "
+"atzera eta hautatu aukera zuzenak."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Bilatu zure kokalekua gure datu-basean:"
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr "Ikuskatu aukerak"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Bilatu"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Hautatu kokaleku bat"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr ""
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+
+#~ msgid "Humidex"
+#~ msgstr "Humidex"
+
+#~ msgid "Visibility"
+#~ msgstr "Ikusgarritasuna"
=== modified file 'po/fi.po'
--- po/fi.po 2011-05-20 09:46:56 +0000
+++ po/fi.po 2013-05-18 18:22:26 +0000
@@ -6,15 +6,23 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-03-19 13:21+0000\n"
"Last-Translator: Jiri Grönroos <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-08-22 13:25+0000\n"
+"Last-Translator: Pasi Tarhonen <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Finnish <fi@xxxxxx>\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-20 06:30+0000\n"
"X-Generator: Launchpad (build 12559)\n"
@@ -258,184 +266,602 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-08-23 05:47+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
+"Language: fi\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Sääennuste sijainnille "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Korkein"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Matalin"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Pasi Tarhonen https://launchpad.net/~pasi-tarhonen";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Aseta sää..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Tietoja..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Asetukset..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Päivitä"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "Varoitus..."
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "Tietoja ei saatavilla"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Sääennustus..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Päivitetään"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "odota"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "juuri nyt"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d minuuttia sitten"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Nimike:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Lämpötila:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "Lämpötila ja kosteus"
+
+#: ../src/service/indicator_weather_service/weather.py:246
+msgid "Humidex:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:247
+msgid "Humidex"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:248
+msgid "Temperature and humidity (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Tuntuu:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Kastepiste:"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Kastepiste"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Ilmankosteus:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Ilmankosteus"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Näkyvyys:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Näkyvyys"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:336
+msgid "Barometer:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:337
+msgid "Barometer"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:346
+msgid "Wind:"
+msgstr "Tuuli:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Tuuli"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Aurinko"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Aurinko nousee:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Auringonnousu"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Aurinko laskee:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Auringonlasku"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr ""
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Pyörremyrsky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Trooppinen myrsky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Hirmumyrsky"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
-msgstr ""
+msgstr "Voimakkaita ukkosmyrskyjä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Ukkosmyrskyjä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Jäätävää tihkusadetta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Tihkusadetta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Jäätävää sadetta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Sadekuuroja"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
-msgstr ""
+msgstr "Lumipyryä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Lunta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Rakeita"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Räntää"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Sumuista"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Tuulista"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Kylmää"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Pilvistä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Enimmäkseen pilvistä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Puolipilvistä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Selkeää"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Aurinkoista"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
msgstr "Poutaa"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Kuumaa"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
-msgstr ""
+msgstr "Paikallisia ukkosmyrskyjä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Hajanaisia ukkosmyrskyjä"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Hajanaisia sadekuuroja"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Voimakasta lumisadetta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Hajanaisia lumikuuroja"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr "Ukkoskuuroja"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Lumikuuroja"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr ""
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+>>>>>>> MERGE-SOURCE
msgstr ""
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:10
+=======
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Lisää sijainti"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:35
msgid "Please search our database for your location:"
msgstr ""
@@ -453,10 +879,33 @@
msgstr "Anna nimi sijainnille:"
#: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Etsi sijaintisi tietokannastamme"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Etsi"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Valitse sijainti"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Anna nimi sijainnille:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
msgid "Name the location"
msgstr "Nimeä sijainti"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
@@ -464,6 +913,7 @@
"Varmista alla olevat valinnat. Jos jokin kohta ei ole oikein, siirry "
"takaisin ja korjaa valinnat."
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
msgstr "<b>Koti</b>"
@@ -477,9 +927,25 @@
msgstr "<b>Orange, Texas</b>"
#: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Koti</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
msgid "Review choices"
msgstr "Varmista valinnat"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Sääilmaisimen asetukset"
@@ -615,3 +1081,132 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Sijainnit"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Sääilmaisimen asetukset"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "Näytä vain sääsymboli"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Näytä vain lämpötila"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Ilmoitukset</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Ei ilmoituksia"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Näytä ilmoitus vain merkittävistä säävaroituksista"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Näytä ilmoitus aina sääennusteen muuttuessa"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Säätietojen lähde</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Päivitysväli"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minuuttia"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Yleiset"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Lämpötilan asteikko</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Imperiaalinen (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrinen, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Tuulen nopeuden yksikkö</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metriä sekunnissa"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Mailia tunnissa"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Bofori"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Solmut"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Yksiköt"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Sijainnit"
+>>>>>>> MERGE-SOURCE
=== added file 'po/fo.po'
--- po/fo.po 1970-01-01 00:00:00 +0000
+++ po/fo.po 2013-05-18 18:22:26 +0000
@@ -0,0 +1,480 @@
+# Faroese translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-09-11 07:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Faroese <fo@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-12 05:16+0000\n"
+"X-Generator: Launchpad (build 13900)\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Fráboðanir</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Alment"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Knob"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metur um sekundið (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Míl um tíman (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Ongar fráboðanir"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Dagfør hvønn"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutt"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr "Melduródn"
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr "Tropiskur stormur"
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr ""
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr ""
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr ""
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr "Sirm"
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr ""
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr "Ælaveður"
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr ""
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr "Kavi"
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr "Heglingur"
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr "Vátakavi"
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr ""
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr "Mjørki"
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr ""
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr ""
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr ""
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr "Kalt"
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr ""
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr ""
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr ""
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr "Heitt"
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr ""
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr ""
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr ""
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr ""
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vindur"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr ""
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr ""
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr ""
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr ""
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr ""
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr ""
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Set Veður Upp..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr ""
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Sertokkar"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Um..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Endurnýggja"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "Júst nú"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. síðani"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Álvarsom veður ávaring"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr ""
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Høgt"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Lágt"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Spjaldur:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr "Legg eitt stað til"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr "Navngev staðið"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Vinarliga skriva navnið á hesum stað:"
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Vinarliga leita í okkara dátustovni, eftir tínum staði:"
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Leita"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Vel eitt stað"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr ""
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+
+#~ msgid "Visibility"
+#~ msgstr "Sýni"
=== modified file 'po/fr.po'
--- po/fr.po 2011-05-20 09:46:56 +0000
+++ po/fr.po 2013-05-18 18:22:26 +0000
@@ -6,18 +6,26 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-04-19 06:48+0000\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-08-21 18:17+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Alexandre Patenaude <Unknown>\n"
"Language-Team: French <fr@xxxxxx>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-20 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-08-22 04:50+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
+"Language: fr\n"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/forecast.py:62
msgid "Weather Forecast for "
msgstr "Prévisions météo pour "
@@ -258,181 +266,606 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Notifications</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Échelle de température</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Source des données météorologiques</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Unité de mesure du vent</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Activer l'indicateur météo"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Général"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Impériale (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr "Km par heure (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Nœuds"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Lieux"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Mètres par seconde (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Milles par heure (mi/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Pas de notification"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+"Afficher les notifications uniquement lors d'alertes de temps violent"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "Système international d’unités (SI, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr "Montrer la température près de l'indicateur"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unités"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Mettre à jour toutes les"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Afficher les notifications pour tout changement météorologique"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Configuration de l'indicateur météo"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutes"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+"Une erreur inconnue est survenue pendant la récupération des données "
+"météorologiques"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Tornade"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Tempête tropicale"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Ouragan"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
msgstr "Orages violents"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Orages"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr "Mélange de pluie et de neige"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr "Pluie et neige fondante"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr "Neige et neige fondante"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Bruine verglaçante"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Bruine"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Pluie verglaçante"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Averses"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
msgstr "Rafales de neige"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr "Légères averses de neige"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
msgstr "Poudrerie"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Neige"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Grêle"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
-msgstr "Neige fondante"
+msgstr "Neige fondue"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
-msgstr "Poussières"
+msgstr "Poussière"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Brumeux"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr "Brume"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr "Enfumé"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr "Bourrasques"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Venteux"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Froid"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Nuageux"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Plutôt nuageux"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Partiellement nuageux"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Clair"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Ensoleillé"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
msgstr "Beau temps"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr "Pluie et grêle"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Chaud"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr "Orages isolés"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Orages épars"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Averses éparses"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Fortes chutes de neige"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Averses de neige éparses"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr "Averses orageuses"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Averses de neige"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr "Averses orageuses isolées"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Conditions inconnues"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Humidité"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Pression"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Température"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vent"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Lever du soleil"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Coucher du soleil"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "N"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "NE"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "E"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "SE"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "S"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "SO"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "O"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "NO"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Configurer la météo..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Prévisions"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Configuration..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "À propos..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Actualisation en cours..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "À l'instant"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "il y a %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerte de temps violent"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Indicateur météo"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Agmenor https://launchpad.net/~agmenor\n";
+" Alexandre Patenaude https://launchpad.net/~alexandrep\n";
+" Arzach https://launchpad.net/~arzach\n";
+" Baptiste Fontaine https://launchpad.net/~bfontaine\n";
+" Delarocque Julien https://launchpad.net/~jdelarocque\n";
+" Fish https://launchpad.net/~thomas-poisson-live\n";
+" François Laurent https://launchpad.net/~francois.laurent";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Prévisions météo pour "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Maximum"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Minimum"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Libellé :"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Une autre instance de ce programme est déjà en cours d'exécution"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Accueil</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Ajouter un lieu"
@@ -456,13 +889,25 @@
msgid "Name the location"
msgstr "Nom du lieu"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Entrez un nom pour ce lieu :"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
msgstr ""
-"Vérifiez les informations ci-dessous. Si elles sont incorrectes, revenez en "
-"arrière et sélectionnez les bonnes options."
+"Vérifiez les sélections ci-dessous. Si elles sont incorrectes, revenez en "
+"arrière et refaites votre sélection."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Recherchez votre lieu dans notre base de données :"
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
@@ -478,8 +923,9 @@
#: ../data/ui/Assistant.ui:289
msgid "Review choices"
-msgstr "Validation des informations"
+msgstr "Vérifiez votre sélection"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Configuration de l'indicateur météo"
@@ -615,3 +1061,30 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Lieux"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Sélectionnez un lieu"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Prévisions à long terme"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Un indicateur météo qui affiche les informations pour un ou plusieurs "
+"endroits dans le monde"
+
+#~ msgid "Humidex"
+#~ msgstr "Indice d'humidité"
+
+#~ msgid "Visibility"
+#~ msgstr "Visibilité"
+>>>>>>> MERGE-SOURCE
=== added file 'po/gl.po'
--- po/gl.po 1970-01-01 00:00:00 +0000
+++ po/gl.po 2013-05-18 18:22:26 +0000
@@ -0,0 +1,480 @@
+# Galician translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-11-07 23:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-08 06:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr ""
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr ""
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr ""
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr ""
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr ""
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr ""
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr ""
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr ""
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr ""
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr ""
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr ""
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr ""
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr ""
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr ""
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr ""
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr ""
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr ""
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr ""
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr ""
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr ""
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr ""
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr ""
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr ""
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr ""
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr ""
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr ""
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr ""
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr ""
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr ""
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Configurar o tempo..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr ""
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Preferencias…"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Sobre..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "agora mesmo"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "fai %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerta grave do tempo"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Predición para "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Alta"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Baixa"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etiqueta:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr ""
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr ""
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+
+#~ msgid "Humidex"
+#~ msgstr "Humidex"
=== added file 'po/he.po'
--- po/he.po 1970-01-01 00:00:00 +0000
+++ po/he.po 2013-05-18 18:22:26 +0000
@@ -0,0 +1,480 @@
+# Hebrew translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-09-22 10:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-23 04:56+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr ""
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr "טורנדו"
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr "סופה טרופית"
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr "סופת הוריקן"
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr "סופות רעמים חמורות"
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr "סופות רעמים"
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr ""
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr ""
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr "גשם קל"
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr "גשם מקפיא"
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr "ממטרים"
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr ""
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr "ממטרי שלג קלים"
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr "שלג"
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr "ברד"
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr "גשם מעורב בשלג"
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr "אבק"
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr "מעורפל"
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr "אובך"
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr ""
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr "רוחות עזות"
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr "רוחות"
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr "קר"
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr "מעונן"
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr "מעונן לרוב"
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr "מעונן חלקית"
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr "בהיר"
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr "שמשי"
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr "סביר"
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr "חם"
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr "שלג כבד"
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr "ממטרי שלג"
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr ""
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "לחות"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr ""
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr ""
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "רוח"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "זריחה"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "שקיעה"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr ""
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr ""
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr ""
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr ""
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr ""
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr ""
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr ""
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "העדפות..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "אודות..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "רענן"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "לפני %d דקות"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "התראה על מזג אוויר קשה"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "תחזית מזג אוויר עבור "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "גבוה"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "נמוך"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "תוית:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr "הוסף יעד"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "מיקום:"
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "חיפוש"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "בחר מיקום"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr ""
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+
+#~ msgid "Visibility"
+#~ msgstr "ראות"
=== modified file 'po/hr.po'
--- po/hr.po 2011-05-20 09:46:56 +0000
+++ po/hr.po 2013-05-18 18:22:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Croatian translation for weather-indicator
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the weather-indicator package.
@@ -613,3 +614,512 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Lokacije"
+=======
+# Croatian translation for weather-indicator
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the weather-indicator package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: weather-indicator\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-06-15 01:02+0000\n"
+"Last-Translator: Miroslav Matejaš <silverspace@xxxxxxxxxxxxx>\n"
+"Language-Team: Croatian <hr@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-23 05:53+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: hr\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Obavijesti</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Temperaturna ljestvica</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Izvor podataka za vremensku prognozu</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Oznaka brzine vjetra</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Bofor"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Općenito"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Čvorova"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Lokacije"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metara u sekundi (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Milja na sat (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Nemoj obaviještavati"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrički, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Jedinice mjere"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Osvježenje svakih"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Postavke pokazatelja vremena"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minuta"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr "Tornado"
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr "Tropska oluja"
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr "Uragan"
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr "Oluje"
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr ""
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr "Ledeno rominjanje"
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr "Rominjanje"
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr "Ledena kiša"
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr "Pljuskovi"
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr ""
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr "Lagani ljetni pljuskovi"
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr "Snežni nanosi"
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr "Snijeg"
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr "Tuča"
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr "Susnježica"
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr "Prašina"
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr "Maglovito"
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr "Izmaglica"
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr "Dim"
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr "Vijavica"
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr "Vjetrovito"
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr "Hladno"
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr "Oblačno"
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr "Uglavnom oblačno"
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr "Djelomično oblačno"
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr "Čisto bez oblaka"
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr "Sunčano"
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr "Vedro"
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr "Vruće"
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr "Jak snijeg"
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:597
+msgid "Thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:598
+msgid "Snow showers"
+msgstr "Mećava"
+
+#: ../bin/indicator-weather.py:599
+msgid "Isolated thundershowers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Nepoznati vremenski uvjeti"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Vlažnost"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Tlak"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vjetar"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Izlazak sunca"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Zalazak sunca"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "S"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "SI"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "I"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "JI"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "J"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "JZ"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "Z"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "SZ"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Postavljeno vrijeme ..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Dugoročna prognoza"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Osobitosti"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "O programu"
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Osvježi"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "upravo sada"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "prije %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr ""
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Vremenska prognoza"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Miroslav Matejaš https://launchpad.net/~silverspace+amd64";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Vremenska prognoza za "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Visoka"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Niska"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Naziv:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Dom</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:3
+msgid "Add a location"
+msgstr "Dodaj lokaciju"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Lokacija:"
+
+#: ../data/ui/Assistant.ui.h:6
+msgid "Name the location"
+msgstr "Naziv lokacije"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Molim unesite ime za ovu lokaciju:"
+
+#: ../data/ui/Assistant.ui.h:8
+msgid ""
+"Please review the choices below. If anything is not correct, please go back "
+"and select the correct options."
+msgstr ""
+"Molim pregledasjte izbore ispod.Ako bolo što nije u redu,vratite se i "
+"odaberite ispravne opcije."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Molim pretražite našu bazu podataka za vašu lokaciju:"
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr "Pregledaj izbore"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Pretraži"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Odaberite lokaciju"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr ""
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+
+#~ msgid "mph"
+#~ msgstr "mph"
+
+#~ msgid "knot(s)"
+#~ msgstr "čvor"
+
+#~ msgid "km/h"
+#~ msgstr "km/h"
+
+#~ msgid "m/s"
+#~ msgstr "m/s"
+
+#~ msgid "refreshed just now"
+#~ msgstr "osvježite sada"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "zadnje osvježenje prije % s min."
+
+#~ msgid "Condition"
+#~ msgstr "Stanje"
+
+#~ msgid "Visibility"
+#~ msgstr "Vidljivost"
+>>>>>>> MERGE-SOURCE
=== modified file 'po/hu.po'
--- po/hu.po 2011-05-20 09:46:56 +0000
+++ po/hu.po 2013-05-18 18:22:26 +0000
@@ -6,18 +6,27 @@
msgid ""
msgstr ""
"Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-20 02:26-0700\n"
"PO-Revision-Date: 2011-03-30 06:54+0000\n"
"Last-Translator: aolah <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-06-29 12:33+0000\n"
+"Last-Translator: Richard Somlói <ricsipontaz@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Hungarian <hu@xxxxxx>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-31 06:33+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-06-30 05:18+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: hu\n"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/forecast.py:62
msgid "Weather Forecast for "
msgstr "Időjárás-előrejelzés: "
@@ -60,8 +69,89 @@
#: ../src/service/indicator_weather_service/menu.py:613
#: ../src/service/indicator_weather_service/menu.py:617
msgid "Refresh"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Értesítések</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Hőmérsékleti skála</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Időjárási adatok forrása</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Szélsebesség egysége</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Időjárás-jelentés engedélyezése"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Általános"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Angolszász (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr "Km per óra (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Csomó"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Helyek"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Méter per másodperc (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Mérföld per óra (mérföld/óra)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Nincsenek értesítések"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Értesítés csak riasztás esetén"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrikus, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr "Hőmérséklet megjelenítése az indikátor mellett"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Mértékegységek"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+>>>>>>> MERGE-SOURCE
msgstr "Frissítés"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/menu.py:167
msgid "Warning..."
msgstr ""
@@ -258,181 +348,520 @@
msgstr ""
#: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Értesítés minden időjárás-változásról"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Időjárás-jelentés beállításai"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "percenként"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr "Ismeretlen hiba lépett fel az időjárás adatok beszerzése közben"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
msgid "Tornado"
msgstr "Tornádó"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
msgid "Tropical storm"
msgstr "Trópusi vihar"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
msgid "Hurricane"
msgstr "Hurrikán"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
msgid "Severe thunderstorms"
msgstr "Jelentős zivatarok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
msgid "Thunderstorms"
msgstr "Viharok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and snow"
msgstr "Havas eső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and sleet"
msgstr "Ónos eső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
msgid "Mixed snow and sleet"
msgstr "Havazás és jégeső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
msgid "Freezing drizzle"
msgstr "Jeges szitálás"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
msgid "Drizzle"
msgstr "Szitáló eső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
msgid "Freezing rain"
msgstr "Fagyos eső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:69
#: ../src/service/indicator_weather_service/providers/yahoo.py:70
+=======
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+>>>>>>> MERGE-SOURCE
msgid "Showers"
msgstr "Záporok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
msgid "Snow flurries"
msgstr "Hózáporok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
msgid "Light snow showers"
msgstr "Könnyű hózápor"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
msgid "Blowing snow"
msgstr "Hófúvás"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
msgid "Snow"
msgstr "Hó"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
msgid "Hail"
msgstr "Jégeső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
msgid "Sleet"
msgstr "Ólmos eső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
msgid "Dust"
msgstr "Por"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
msgid "Foggy"
msgstr "Ködös"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
msgid "Haze"
msgstr "Száraz légköri homály"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
msgid "Smoky"
msgstr "Füstös"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
msgid "Blustery"
msgstr "Erős széllökések"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
msgid "Windy"
msgstr "Szeles"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
msgid "Cold"
msgstr "Hideg"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
msgid "Cloudy"
msgstr "Felhős"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:85
#: ../src/service/indicator_weather_service/providers/yahoo.py:86
+=======
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+>>>>>>> MERGE-SOURCE
msgid "Mostly cloudy"
msgstr "Nagyrészt felhős"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:87
#: ../src/service/indicator_weather_service/providers/yahoo.py:88
#: ../src/service/indicator_weather_service/providers/yahoo.py:102
+=======
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+>>>>>>> MERGE-SOURCE
msgid "Partly cloudy"
msgstr "Részben felhős"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
msgid "Clear"
msgstr "Tiszta"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
msgid "Sunny"
msgstr "Napsütés"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:91
#: ../src/service/indicator_weather_service/providers/yahoo.py:92
+=======
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+>>>>>>> MERGE-SOURCE
msgid "Fair"
msgstr "Szép idő"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
msgid "Mixed rain and hail"
msgstr "Jeges eső"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
msgid "Hot"
msgstr "Hőség"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
msgid "Isolated thunderstorms"
msgstr "Elszigetelt viharok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:96
#: ../src/service/indicator_weather_service/providers/yahoo.py:97
+=======
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+>>>>>>> MERGE-SOURCE
msgid "Scattered thunderstorms"
msgstr "Szórványosan zivatarok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
msgid "Scattered showers"
msgstr "Szórványosan záporok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:99
#: ../src/service/indicator_weather_service/providers/yahoo.py:101
+=======
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+>>>>>>> MERGE-SOURCE
msgid "Heavy snow"
msgstr "Erős havazás"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
msgid "Scattered snow showers"
msgstr "Szórványosan hózáporok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
msgid "Thundershowers"
msgstr "Zivatarok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
msgid "Snow showers"
msgstr "Hózápor"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
msgid "Isolated thundershowers"
msgstr "Elszigetelt zivatarok"
+<<<<<<< TREE
#: ../src/service/indicator_weather_service/providers/yahoo.py:106
msgid "Unknown condition"
msgstr ""
#: ../data/ui/Assistant.ui:10
+=======
+#: ../bin/indicator-weather.py:600 ../bin/indicator-weather.py:622
+#: ../bin/indicator-weather.py:627 ../bin/indicator-weather.py:645
+#: ../bin/indicator-weather.py:654 ../bin/indicator-weather.py:664
+#: ../bin/indicator-weather.py:748 ../bin/indicator-weather.py:1730
+msgid "Unknown condition"
+msgstr "Ismeretlen körülmények"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Páratartalom"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Légnyomás"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Hőmérséklet"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Szél"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Napkelte"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Napnyugta"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "É"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "ÉK"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "K"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "DK"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "D"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "DNy"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "Ny"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "ÉNy"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Időjárás-jelentés beállítása…"
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Előrejelzés"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Beállítások…"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Névjegy…"
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Frissítés, egy pillanat"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Frissítés"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "épp most"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d perce"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Időjárási riasztás"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Időjárás-jelentés"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Gabor Kelemen https://launchpad.net/~kelemeng\n";
+" Richard Somlói https://launchpad.net/~ricsipontaz\n";
+" aolah https://launchpad.net/~aolah\n";
+" phontanka https://launchpad.net/~phontanka";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Időjárás-előrejelzés: "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Legmagasabb"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Legalacsonyabb"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Címke:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Már fut a program egy másik példánya"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Otthon</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+msgstr "<b>Orange, Texas</b>"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
msgid "Add a location"
msgstr "Hely hozzáadása"
@@ -456,7 +885,15 @@
msgid "Name the location"
msgstr "Nevezze el a helyet"
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Adja meg a hely nevét:"
+
+#: ../data/ui/Assistant.ui.h:8
+>>>>>>> MERGE-SOURCE
msgid ""
"Please review the choices below. If anything is not correct, please go back "
"and select the correct options."
@@ -464,6 +901,7 @@
"Tekintse át a választásait alább. Ha valami nem megfelelő, akkor lépjen "
"vissza, és válassza ki a helyes beállításokat."
+<<<<<<< TREE
#: ../data/ui/Assistant.ui:206
msgid "<b>Home</b>"
msgstr "<b>Otthon</b>"
@@ -477,9 +915,17 @@
msgstr "<b>Orange, Texas</b>"
#: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Kérem keresse meg a kívánt helyet az adatbázisban:"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
msgid "Review choices"
msgstr "Tekintse át a választásait"
+<<<<<<< TREE
#: ../data/ui/PreferencesDialog.ui:31
msgid "Weather Indicator Preferences"
msgstr "Időjárás-jelentés beállításai"
@@ -615,3 +1061,407 @@
#: ../data/ui/PreferencesDialog.ui:931
msgid "Locations"
msgstr "Helyek"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Keresés"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Válasszon egy helyet"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Bővebb előrejelzés"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr "Időjárás-jelentés a világ több pontjáról"
+
+#~ msgid "Decreasing clouds"
+#~ msgstr "Csökkenő felhőzet"
+
+#~ msgid "Patchy fog"
+#~ msgstr "Foltokban ködös"
+
+#~ msgid "Areas fog"
+#~ msgstr "Helyenként ködös"
+
+#~ msgid "Dense fog"
+#~ msgstr "Sűrű köd"
+
+#~ msgid "Volcanic ash"
+#~ msgstr "Vulkáni hamu"
+
+#~ msgid "Clear sky"
+#~ msgstr "Derült ég"
+
+#~ msgid "Snow/rain"
+#~ msgstr "Hó vagy eső"
+
+#~ msgid "mile(s)"
+#~ msgstr "mérföld"
+
+#~ msgid "Wind Direction"
+#~ msgstr "Szélirány"
+
+#~ msgid "<big>Update every (min.)</big>"
+#~ msgstr "<big>Frissítési időköz (perc)</big>"
+
+#~ msgid "MPH"
+#~ msgstr "MPH"
+
+#~ msgid "Imperial"
+#~ msgstr "Angolszász"
+
+#~ msgid "<big>Locations</big>"
+#~ msgstr "<big>Helyek</big>"
+
+#~ msgid "<big>Notifications</big>"
+#~ msgstr "<big>Értesítések</big>"
+
+#~ msgid "<big>Metric Scale</big>"
+#~ msgstr "<big>Metrikus skála</big>"
+
+#~ msgid "<big>Wind Speed Unit</big>"
+#~ msgstr "<big>Szélsebesség mértékegysége</big>"
+
+#~ msgid "MPS"
+#~ msgstr "MPS"
+
+#~ msgid "SI"
+#~ msgstr "SI"
+
+#~ msgid "Show tips in menu"
+#~ msgstr "Javaslatok megjelenítése a menüben"
+
+#~ msgid "Increasing clouds"
+#~ msgstr "Növekvő felhőzet"
+
+#~ msgid "Few clouds"
+#~ msgstr "Kevés felhő"
+
+#~ msgid "Broken clouds"
+#~ msgstr "Szakadozott felhőzet"
+
+#~ msgid "Scattered clouds"
+#~ msgstr "Elszórtan felhős"
+
+#~ msgid "Overcast"
+#~ msgstr "Borult ég"
+
+#~ msgid "Fog"
+#~ msgstr "Köd"
+
+#~ msgid "Blowing dust"
+#~ msgstr "Porfúvás"
+
+#~ msgid "Clearing"
+#~ msgstr "Tisztul"
+
+#~ msgid "Gradual clearing"
+#~ msgstr "Fokozatosan tisztul"
+
+#~ msgid "Patchy ice fog"
+#~ msgstr "Foltokban jeges köd"
+
+#~ msgid "Blowing sand"
+#~ msgstr "Homokfúvás"
+
+#~ msgid "Areas haze"
+#~ msgstr "Helyenként száraz légköri homály"
+
+#~ msgid "Patchy haze"
+#~ msgstr "Foltokban száraz légköri homály"
+
+#~ msgid "Patchy freezing fog"
+#~ msgstr "Foltokban zúzmarás köd"
+
+#~ msgid "Areas freezing fog"
+#~ msgstr "Helyenként zúzmarás köd"
+
+#~ msgid "Areas ice fog"
+#~ msgstr "Helyenként jeges köd"
+
+#~ msgid "Ice fog"
+#~ msgstr "Jeges köd"
+
+#~ msgid "Freezing fog"
+#~ msgstr "Zúzmarás köd"
+
+#~ msgid "Smoke"
+#~ msgstr "Füst"
+
+#~ msgid "Ash"
+#~ msgstr "Hamu"
+
+#~ msgid "Areas ash"
+#~ msgstr "Helyenként hamu"
+
+#~ msgid "Patchy ash"
+#~ msgstr "Foltokban hamu"
+
+#~ msgid "Patchy smoke"
+#~ msgstr "Foltokban füst"
+
+#~ msgid "Areas smoke"
+#~ msgstr "Helyenként füst"
+
+#~ msgid "Freezing spray"
+#~ msgstr "Fagyos permet"
+
+#~ msgid "Areas frost"
+#~ msgstr "Helyenként fagy"
+
+#~ msgid "Frost"
+#~ msgstr "Fagy"
+
+#~ msgid "Patchy frost"
+#~ msgstr "Foltokban fagy"
+
+#~ msgid "Ice crystals"
+#~ msgstr "Jég"
+
+#~ msgid "Areas ice crystals"
+#~ msgstr "Helyenként jég"
+
+#~ msgid "Patchy ice crystals"
+#~ msgstr "Foltokban jég"
+
+#~ msgid "Blizzard"
+#~ msgstr "Hóvihar"
+
+#~ msgid "Light snow"
+#~ msgstr "Hószállingózás"
+
+#~ msgid "Chance snow showers"
+#~ msgstr "Hózápor előfordulhat"
+
+#~ msgid "Snow showers likely"
+#~ msgstr "Hózápor valószínű"
+
+#~ msgid "Slight chance snow/rain"
+#~ msgstr "Hó vagy eső lehet"
+
+#~ msgid "Snow/rain likely"
+#~ msgstr "Hó vagy eső valószínű"
+
+#~ msgid "Chance snow/rain"
+#~ msgstr "Hó vagy eső előfordulhat"
+
+#~ msgid "Chance wintry mix"
+#~ msgstr "Hó és eső előfordulhat"
+
+#~ msgid "Slight chance wintry mix"
+#~ msgstr "Hó és eső lehet"
+
+#~ msgid "Wintry mix likely"
+#~ msgstr "Hó és eső valószínű"
+
+#~ msgid "Slight chance rain"
+#~ msgstr "Eső lehet"
+
+#~ msgid "Slight chance snow showers"
+#~ msgstr "Hózápor lehet"
+
+#~ msgid "Slight chance rain showers"
+#~ msgstr "Zápor lehet"
+
+#~ msgid "Slight chance thunderstorms"
+#~ msgstr "Vihar lehet"
+
+#~ msgid "Slight chance rain/freezing rain"
+#~ msgstr "Eső/fagyos eső lehet"
+
+#~ msgid "Slight chance snow/sleet"
+#~ msgstr "Hó/ólmos eső lehet"
+
+#~ msgid "Slight chance drizzle"
+#~ msgstr "Szitáló eső lehet"
+
+#~ msgid "Slight chance sleet"
+#~ msgstr "Ólmos eső lehet"
+
+#~ msgid "Slight chance freezing rain"
+#~ msgstr "Fagyos eső lehet"
+
+#~ msgid "Chance rain showers"
+#~ msgstr "Zápor előfordulhat"
+
+#~ msgid "Chance snow/sleet"
+#~ msgstr "Hó/ólmos eső előfordulhat"
+
+#~ msgid "Chance sleet"
+#~ msgstr "Ólmos eső előfordulhat"
+
+#~ msgid "Chance rain"
+#~ msgstr "Eső előfordulhat"
+
+#~ msgid "Chance rain/freezing rain"
+#~ msgstr "Eső/fagyos eső előfordulhat"
+
+#~ msgid "Chance thunderstorms"
+#~ msgstr "Vihar előfordulhat"
+
+#~ msgid "Chance drizzle"
+#~ msgstr "Szitáló eső előfordulhat"
+
+#~ msgid "Chance freezing rain"
+#~ msgstr "Fagyos eső előfordulhat"
+
+#~ msgid "Sleet likely"
+#~ msgstr "Ólmos eső valószínű"
+
+#~ msgid "Snow/sleet"
+#~ msgstr "Hó/ólmos eső"
+
+#~ msgid "Snow/sleet likely"
+#~ msgstr "Hó/ólmos eső valószínű"
+
+#~ msgid "Wintry mix"
+#~ msgstr "Hó és eső"
+
+#~ msgid "Rain showers likely"
+#~ msgstr "Zápor valószínű"
+
+#~ msgid "Rain showers"
+#~ msgstr "Záporok"
+
+#~ msgid "Rain likely"
+#~ msgstr "Eső valószínű"
+
+#~ msgid "Rain"
+#~ msgstr "Eső"
+
+#~ msgid "Heavy rain"
+#~ msgstr "Heves esőzés"
+
+#~ msgid "Freezing drizzle likely"
+#~ msgstr "Jeges szitálás valószínű"
+
+#~ msgid "Chance freezing drizzle"
+#~ msgstr "Jeges szitálás előfordulhat"
+
+#~ msgid "Slight chance freezing drizzle"
+#~ msgstr "Jeges szitálás lehet"
+
+#~ msgid "Drizzle likely"
+#~ msgstr "Szitáló eső valószínű"
+
+#~ msgid "Freezing rain likely"
+#~ msgstr "Fagyos eső valószínű"
+
+#~ msgid "Rain/freezing rain likely"
+#~ msgstr "Eső/fagyos eső valószínű"
+
+#~ msgid "Rain/freezing rain"
+#~ msgstr "Eső/fagyos eső"
+
+#~ msgid "Storm"
+#~ msgstr "Vihar"
+
+#~ msgid "Thunderstorms likely"
+#~ msgstr "Vihar valószínű"
+
+#~ msgid "Dew Point"
+#~ msgstr "Harmatpont"
+
+#~ msgid "Sky"
+#~ msgstr "Ég"
+
+#~ msgid "Water spout"
+#~ msgstr "Tuba"
+
+#~ msgid "Condition"
+#~ msgstr "Helyzet"
+
+#~ msgid "Error retreiving condition"
+#~ msgstr "Hiba a helyzet lekérésekor"
+
+#~ msgid "km/h"
+#~ msgstr "km/h"
+
+#~ msgid "Wind Chill"
+#~ msgstr "Hőérzet"
+
+#~ msgid "km"
+#~ msgstr "km"
+
+#~ msgid "Wind Speed"
+#~ msgstr "Szélsebesség"
+
+#~ msgid "m/s"
+#~ msgstr "m/s"
+
+#~ msgid "Visibility"
+#~ msgstr "Látótávolság"
+
+#~ msgid "mph"
+#~ msgstr "mph"
+
+#~ msgid "Connection problem"
+#~ msgstr "Kapcsolathiba"
+
+#~ msgid "High: "
+#~ msgstr "Magas: "
+
+#~ msgid "Low: "
+#~ msgstr "Alacsony: "
+
+#~ msgid "SI (°C)"
+#~ msgstr "SI (°C)"
+
+#~ msgid "Mostly sunny"
+#~ msgstr "Nagyrészt napos"
+
+#~ msgid "Partly sunny"
+#~ msgstr "Részlegesen napos"
+
+#~ msgid "If this is not correct, please go back and select a new city."
+#~ msgstr "Ha nem megfelelő, akkor lépjen vissza, és válasszon másik várost."
+
+#~ msgid "<big>Rungis, France</big>"
+#~ msgstr "<big>Rungis, Franciaország</big>"
+
+#~ msgid "Confirm choice"
+#~ msgstr "Erősítse meg a választást"
+
+#~ msgid "Becoming sunny"
+#~ msgstr "Kiderül"
+
+#~ msgid "Becoming cloudy"
+#~ msgstr "Felhősödik"
+
+#~ msgid "Clearing late"
+#~ msgstr "Mostanában tisztul"
+
+#~ msgid "You have selected:"
+#~ msgstr "Ezt választotta:"
+
+#~ msgid "Please select a location from below:"
+#~ msgstr "Válasszon alább egy helyet:"
+
+#~ msgid "Kilometers per hour (kph)"
+#~ msgstr "Kilométer per óra (km/h)"
+
+#~ msgid "refreshed just now"
+#~ msgstr "most frissítve"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "utoljára %s perce frissítve"
+
+#~ msgid "last refreshed just now"
+#~ msgstr "nemrég frissítve"
+
+#~ msgid "knot(s)"
+#~ msgstr "csomó"
+
+#~ msgid "Please input a location in the combobox below:"
+#~ msgstr "Kérem adjon meg adjon meg egy helyet:"
+
+#~ msgid "Humidex"
+#~ msgstr "Páratartalom"
+>>>>>>> MERGE-SOURCE
=== added file 'po/indicator-weather.pot'
--- po/indicator-weather.pot 1970-01-01 00:00:00 +0000
+++ po/indicator-weather.pot 2013-05-18 18:22:26 +0000
@@ -0,0 +1,477 @@
+# 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: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr ""
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr ""
+
+#: ../bin/indicator-weather.py:551
+msgid "Tornado"
+msgstr ""
+
+#: ../bin/indicator-weather.py:552
+msgid "Tropical storm"
+msgstr ""
+
+#: ../bin/indicator-weather.py:553
+msgid "Hurricane"
+msgstr ""
+
+#: ../bin/indicator-weather.py:554
+msgid "Severe thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:555
+msgid "Thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:556
+msgid "Mixed rain and snow"
+msgstr ""
+
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#: ../bin/indicator-weather.py:558
+msgid "Mixed rain and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:559
+msgid "Mixed snow and sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:560
+msgid "Freezing drizzle"
+msgstr ""
+
+#: ../bin/indicator-weather.py:561
+msgid "Drizzle"
+msgstr ""
+
+#: ../bin/indicator-weather.py:562
+msgid "Freezing rain"
+msgstr ""
+
+#: ../bin/indicator-weather.py:563 ../bin/indicator-weather.py:564
+msgid "Showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:565
+msgid "Snow flurries"
+msgstr ""
+
+#: ../bin/indicator-weather.py:566
+msgid "Light snow showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:567
+msgid "Blowing snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:568
+msgid "Snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:569
+msgid "Hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:570
+msgid "Sleet"
+msgstr ""
+
+#: ../bin/indicator-weather.py:571
+msgid "Dust"
+msgstr ""
+
+#: ../bin/indicator-weather.py:572
+msgid "Foggy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:573
+msgid "Haze"
+msgstr ""
+
+#: ../bin/indicator-weather.py:574
+msgid "Smoky"
+msgstr ""
+
+#: ../bin/indicator-weather.py:575
+msgid "Blustery"
+msgstr ""
+
+#: ../bin/indicator-weather.py:576
+msgid "Windy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:577
+msgid "Cold"
+msgstr ""
+
+#: ../bin/indicator-weather.py:578
+msgid "Cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:579 ../bin/indicator-weather.py:580
+msgid "Mostly cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:581 ../bin/indicator-weather.py:582
+#: ../bin/indicator-weather.py:596
+msgid "Partly cloudy"
+msgstr ""
+
+#: ../bin/indicator-weather.py:583
+msgid "Clear"
+msgstr ""
+
+#: ../bin/indicator-weather.py:584
+msgid "Sunny"
+msgstr ""
+
+#: ../bin/indicator-weather.py:585 ../bin/indicator-weather.py:586
+msgid "Fair"
+msgstr ""
+
+#: ../bin/indicator-weather.py:587
+msgid "Mixed rain and hail"
+msgstr ""
+
+#: ../bin/indicator-weather.py:588
+msgid "Hot"
+msgstr ""
+
+#: ../bin/indicator-weather.py:589
+msgid "Isolated thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:590 ../bin/indicator-weather.py:591
+msgid "Scattered thunderstorms"
+msgstr ""
+
+#: ../bin/indicator-weather.py:592
+msgid "Scattered showers"
+msgstr ""
+
+#: ../bin/indicator-weather.py:593 ../bin/indicator-weather.py:595
+msgid "Heavy snow"
+msgstr ""
+
+#: ../bin/indicator-weather.py:594
+msgid "Scattered snow sh
