weather-indicator-team team mailing list archive

[Jalakas <anari.jalakas@xxxxxxxxx>]

Jalakas has proposed merging lp:~weather-indicator-team/weather-indicator/translations into lp:weather-indicator.

Requested reviews:
  Weather Indicator Team (weather-indicator-team)

For more details, see:
https://code.launchpad.net/~weather-indicator-team/weather-indicator/translations/+merge/79883

Oneiric should have translation updates
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~weather-indicator-team/weather-indicator/translations/+merge/79883
Your team Weather Indicator Team is requested to review the proposed merge of lp:~weather-indicator-team/weather-indicator/translations into lp:weather-indicator.

=== modified file 'po/ar.po'
--- po/ar.po	2011-05-20 09:46:56 +0000
+++ po/ar.po	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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-09-12 18:04+0000\n"
+"Last-Translator: Henrik Graßhoff <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,604 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-09-13 05:01+0000\n"
+"X-Generator: Launchpad (build 13910)\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";
+"  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 +883,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>Home</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 +945,7 @@
 msgid "Review choices"
 msgstr "Auswahl überprüfen"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Wetterindikator-Einstellungen"
@@ -615,3 +1081,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 für Unwetterwarnungen anzeigen"
+
+#: ../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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +0000
@@ -0,0 +1,602 @@
+# 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-16 12:05+0000\n"
+"Last-Translator: Jalakas <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-17 05:01+0000\n"
+"X-Generator: Launchpad (build 14155)\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";
+"  tabbernuk https://launchpad.net/~boamaod";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "viga"
+
+#: ../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 ""
+
+#: ../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 "Niiskusindeks ja tuulekülm (Kanada)"
+
+#: ../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 "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 ""
+
+#: ../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 ""
+
+#: ../data/ui/Assistant.ui.h:10
+msgid "Review choices"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"

=== modified file 'po/fi.po'
--- po/fi.po	2011-05-20 09:46:56 +0000
+++ po/fi.po	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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/he.po'
--- po/he.po	1970-01-01 00:00:00 +0000
+++ po/he.po	2011-10-19 20:29:25 +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	2011-10-19 20:29:25 +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-05-03 16:32+0000\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"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Miroslav Matejaš <silverspace@xxxxxxxxxxxxx>\n"
 "Language-Team: Croatian <hr@xxxxxx>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-04 05:32+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: hr\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr ""
@@ -258,181 +266,597 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../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
+>>>>>>> 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 ""
+msgstr "Tropska oluja"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
-msgstr ""
+msgstr "Uragan"
 
+<<<<<<< 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 "Oluje"
 
+<<<<<<< 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 "Ledeno rominjanje"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Rominjanje"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Ledena kiša"
 
+<<<<<<< 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 "Pljuskovi"
 
+<<<<<<< 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 ""
+msgstr "Lagani ljetni pljuskovi"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Snežni nanosi"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Snijeg"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
 msgid "Hail"
 msgstr "Tuča"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
 msgid "Sleet"
-msgstr ""
+msgstr "Susnježica"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Prašina"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
-msgstr "Magla"
+msgstr "Maglovito"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
 msgstr "Izmaglica"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
 msgstr "Dim"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
 msgstr "Vijavica"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
 msgstr "Vjetrovito"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
 msgstr "Hladno"
 
+<<<<<<< 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 "Uglavnom oblačno"
 
+<<<<<<< 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 "Djelomično oblačno"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
-msgstr "Čisto"
+msgstr "Čisto bez oblaka"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Sunčano"
 
+<<<<<<< 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 "Vedro"
 
+<<<<<<< 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 "Vruće"
 
+<<<<<<< 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 "Jak snijeg"
 
+<<<<<<< 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 "Mećava"
 
+<<<<<<< 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 "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
+>>>>>>> MERGE-SOURCE
 msgid "Add a location"
 msgstr "Dodaj lokaciju"
 
@@ -456,11 +880,25 @@
 msgid "Name the location"
 msgstr "Naziv lokacije"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:151
+=======
+#: ../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
+>>>>>>> MERGE-SOURCE
 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:206
 msgid "<b>Home</b>"
@@ -476,8 +914,9 @@
 
 #: ../data/ui/Assistant.ui:289
 msgid "Review choices"
-msgstr ""
+msgstr "Pregledaj izbore"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr ""
@@ -613,3 +1052,47 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Lokacije"
+=======
+#: ../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	2011-10-19 20:29:25 +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

=== modified file 'po/it.po'
--- po/it.po	2011-05-20 09:46:56 +0000
+++ po/it.po	2011-10-19 20:29:25 +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-07 09:50+0000\n"
 "Last-Translator: Fabrizio Narni <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-10-01 09:20+0000\n"
+"Last-Translator: simone.sandri <lexluxsox@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Italian <it@xxxxxx>\n"
 "Language: it\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-08 06:11+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-10-02 05:13+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
+"Language: it\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr "Previsioni meteo per "
@@ -258,183 +267,605 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Notifiche</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Scala di temperatura</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Sorgente dati meteo</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Unità di misura della velocità del vento</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Scala Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Abiltare l'applet indicatore meteo"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Impostazioni generali"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Farenheit (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr "Km orari (Km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Nodi"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Località"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metri al secondo (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Miglia all'ora (mi/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Nessuna notifica"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Solo per segnalare gravi allerte meteo"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "SI (metrico, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr "Mostra temperatura vicino l'indicatore"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unità di misura"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Aggiorna ogni"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Indicare ogni cambiamento delle condizioni meteo"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Preferenze dell'indicatore meteo"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minuti"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr "Errore sconosciuto durante l'elaborazione dei dati meteo"
+
+#: ../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 "Tempesta tropicale"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Uragano"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
 msgstr "Forti temporali"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Temporali"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
 msgstr "Pioggia mista a neve"
 
+<<<<<<< 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 "Pioggia e nevischio"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
 msgstr "Pioggia mista a neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Pioggerella gelata"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Pioggerella"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Pioggia gelida"
 
+<<<<<<< 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 "Rovesci"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
 msgstr "Folate di neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
 msgstr "Neve asciutta"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Tormenta"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
 msgid "Hail"
 msgstr "Grandine"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
 msgid "Sleet"
 msgstr "Nevischio"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Polvere"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Nebbioso"
 
+<<<<<<< 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 "Fumoso"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
 msgstr "Burrasca"
 
+<<<<<<< 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 "Freddo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
 msgid "Cloudy"
 msgstr "Nuvolo"
 
+<<<<<<< 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 "Abbastanza nuvoloso"
 
+<<<<<<< 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 "Parzialmente nuvoloso"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
 msgstr "Sereno"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Soleggiato"
 
+<<<<<<< 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 "Sereno"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
 msgstr "Pioggia mista a grandine"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
 msgid "Hot"
 msgstr "Caldo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thunderstorms"
 msgstr "Temporali isolati"
 
+<<<<<<< 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 "Temporali isolati"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
 msgstr "Rovesci sparsi"
 
+<<<<<<< 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 "Forte nevicata"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
 msgstr "Nevicate isolate"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
 msgstr "Rovesci temporaleschi"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Nevicate sparse"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thundershowers"
 msgstr "Temporali isolati"
 
+<<<<<<< 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 "Sconosciuta"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Umidità"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Pressione"
+
+#: ../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 "Sconosciuto"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vento"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Alba"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Tramonto"
+
+#. 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 "SW"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "W"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "NW"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Imposta meteo..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Previsioni meteo"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Preferenze"
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Informazioni su..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "In aggiornamento, attendere"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "adesso"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. fa"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Grave allerta meteo"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Indicatore meteo"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Fabrizio Narni https://launchpad.net/~shiba89\n";
+"  François Laurent https://launchpad.net/~francois.laurent\n";
+"  Kim Allamandola https://launchpad.net/~spacexplorer\n";
+"  Luca Ferretti https://launchpad.net/~elle.uca\n";
+"  Vadim Rutkovsky https://launchpad.net/~roignac\n";
+"  fasix https://launchpad.net/~vito.fasano\n";
+"  simone.sandri https://launchpad.net/~lexluxsox";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Previsioni meteo per "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Massima"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Minima"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etichetta:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "È già in esecuzione un'altra istanza di questo programma"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Home</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 "Aggiunge una località"
+msgstr "Aggiungi una località"
 
 #: ../data/ui/Assistant.ui:35
 msgid "Please search our database for your location:"
@@ -456,13 +887,25 @@
 msgid "Name the location"
 msgstr "Nome della località"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Inserire un nome per questa località:"
+
+#: ../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 ""
-"Controllare quanto scelto qui sotto. Se qualcosa risultasse no corretto, "
-"tornare indietro e selezionare l'opzione corretta."
+"Controllare quanto scelto qui sotto. Se qualcosa risultasse errato, tornare "
+"indietro e selezionare l'opzione corretta."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Ricerca nel database la tua località"
 
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
@@ -478,8 +921,9 @@
 
 #: ../data/ui/Assistant.ui:289
 msgid "Review choices"
-msgstr "Revisione scelte"
+msgstr "Rivedi le scelte"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Preferenze dell'indicatore meteo"
@@ -615,3 +1059,29 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Località"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Cerca"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Seleziona una località"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Previsioni estese"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Un indicatore meteo che mostra informazioni su uno o più luoghi nel mondo"
+
+#~ msgid "Visibility"
+#~ msgstr "Visibilità"
+
+#~ msgid "Humidex"
+#~ msgstr "Humidex"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/ja.po'
--- po/ja.po	2011-05-20 09:46:56 +0000
+++ po/ja.po	2011-10-19 20:29:25 +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-05-09 09:07+0000\n"
 "Last-Translator: Jo Ogawa <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-09-27 15:43+0000\n"
+"Last-Translator: Guybrush88 <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Japanese <ja@xxxxxx>\n"
 "Language: ja\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-05-10 07:11+0000\n"
 "X-Generator: Launchpad (build 12959)\n"
 
@@ -258,184 +266,601 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-09-28 06:03+0000\n"
+"X-Generator: Launchpad (build 14049)\n"
+"Language: ja\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"
+"  Guybrush88 https://launchpad.net/~guybrush";
+
+#: ../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 ""
+
+#: ../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 ""
 
+<<<<<<< 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 ""
+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 ""
 
+<<<<<<< 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 "激しい雪"
 
+<<<<<<< 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 "打ちつけるような雪"
 
+<<<<<<< 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 +878,41 @@
 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 "検索"
+
+#: ../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 ""
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr ""
@@ -475,9 +926,25 @@
 msgstr ""
 
 #: ../data/ui/Assistant.ui:289
+=======
+#: ../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.h:10
+>>>>>>> MERGE-SOURCE
 msgid "Review choices"
 msgstr ""
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr ""
@@ -613,3 +1080,132 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr ""
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Weather Indicatorの設定"
+
+#: ../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>通知方法</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 "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../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 ""
+
+#: ../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 "メートル毎秒 (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "マイル毎時 (mph)"
+
+#: ../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

=== added file 'po/kk.po'
--- po/kk.po	1970-01-01 00:00:00 +0000
+++ po/kk.po	2011-10-19 20:29:25 +0000
@@ -0,0 +1,480 @@
+# Kazakh 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-10-14 11:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Kazakh <kk@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-15 05:17+0000\n"
+"X-Generator: Launchpad (build 14124)\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 ""
+
+#: ../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/ko.po'
--- po/ko.po	2011-05-20 09:46:56 +0000
+++ po/ko.po	2011-10-19 20:29:25 +0000
@@ -6,8 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-20 02:26-0700\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2011-03-11 03:49+0000\n"
 "Last-Translator: Ernesto2k <boramism@xxxxxxxxx>\n"
 "Language-Team: Korean <ko@xxxxxx>\n"
@@ -15,9 +20,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-12 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-06-23 05:53+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: ko\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr "날씨 예보 - "
@@ -258,181 +265,597 @@
 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 "구글"
+
+#: ../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 "미터/초 (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 "야후!"
+
+#: ../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 "눈발 흩날림"
 
+<<<<<<< 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 "바람"
 
+<<<<<<< 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 "뇌우"
 
+<<<<<<< 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 "고립형 뇌우"
 
+<<<<<<< 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 "습도"
+
+#: ../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"
+"  Ernesto2k https://launchpad.net/~boramism";
+
+#: ../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,10 +879,19 @@
 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."
+<<<<<<< TREE
 msgstr ""
 "아래에 표시된 선택을 다시 확인해주십시오. 올바르지 않은 것이 있다면, 뒤로 돌"
 "아가 올바른 옵션을 선택해주십시오."
@@ -477,9 +909,19 @@
 msgstr "<b>텍사스 주, 오렌지 시</b>"
 
 #: ../data/ui/Assistant.ui:289
+=======
+msgstr "아래에 표시된 선택을 다시 확인해주십시오. 올바르지 않은 것이 있다면, 뒤로 돌아가 올바른 옵션을 선택해주십시오."
+
+#: ../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 +1057,452 @@
 #: ../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 "<big>Update every (min.)</big>"
+#~ msgstr "<big>업데이트 주기 (분)</big>"
+
+#~ msgid "Imperial"
+#~ msgstr "영국 식 단위"
+
+#~ msgid "MPH"
+#~ msgstr "마일/시"
+
+#~ msgid "<big>Locations</big>"
+#~ msgstr "<big>위치</big>"
+
+#~ msgid "<big>Notifications</big>"
+#~ msgstr "<big>알림</big>"
+
+#~ msgid "<big>Metric Scale</big>"
+#~ msgstr "<big>미터법 단위</big>"
+
+#~ msgid "<big>Wind Speed Unit</big>"
+#~ msgstr "<big>풍속 단위</big>"
+
+#~ msgid "MPS"
+#~ msgstr "마일/초"
+
+#~ msgid "SI"
+#~ msgstr "국제 단위"
+
+#~ msgid "Show tips in menu"
+#~ msgstr "메뉴에 팁 표시"
+
+#~ msgid "Mostly sunny"
+#~ msgstr "대체로 맑음"
+
+#~ msgid "Partly sunny"
+#~ msgstr "부분적으로 맑음"
+
+#~ msgid "Becoming sunny"
+#~ msgstr "점차 맑아짐"
+
+#~ msgid "Clear sky"
+#~ msgstr "맑은 하늘"
+
+#~ msgid "Decreasing clouds"
+#~ msgstr "구름 감소"
+
+#~ msgid "Increasing clouds"
+#~ msgstr "구름 증가"
+
+#~ msgid "Few clouds"
+#~ msgstr "약간의 구름이 낀 하늘"
+
+#~ msgid "Broken clouds"
+#~ msgstr "구름이 거의 없는 하늘"
+
+#~ msgid "Scattered clouds"
+#~ msgstr "드문드문 구름이 낀 하늘"
+
+#~ msgid "Overcast"
+#~ msgstr "구름으로 뒤덮인 흐린 하늘"
+
+#~ msgid "Patchy fog"
+#~ msgstr "군데군데 안개"
+
+#~ msgid "Fog"
+#~ msgstr "안개"
+
+#~ msgid "Areas fog"
+#~ msgstr "부분적으로 안개"
+
+#~ msgid "Dense fog"
+#~ msgstr "짙은 안개"
+
+#~ msgid "Blowing dust"
+#~ msgstr "먼지 날림"
+
+#~ msgid "Becoming cloudy"
+#~ msgstr "점차 흐려짐"
+
+#~ msgid "Clearing"
+#~ msgstr "날씨 갬"
+
+#~ msgid "Gradual clearing"
+#~ msgstr "점차 갬"
+
+#~ msgid "Patchy ice fog"
+#~ msgstr "군데군데 얼음 안개"
+
+#~ msgid "Blowing sand"
+#~ msgstr "모래 날림"
+
+#~ msgid "Areas haze"
+#~ msgstr "부분적으로 아지랑이"
+
+#~ msgid "Patchy haze"
+#~ msgstr "군데군데 아지랑이"
+
+#~ msgid "Patchy freezing fog"
+#~ msgstr "군데 군데 얼어붙는 안개"
+
+#~ msgid "Areas freezing fog"
+#~ msgstr "부분적으로 얼어붙는 안개"
+
+#~ msgid "Areas ice fog"
+#~ msgstr "부분적으로 얼음 안개"
+
+#~ msgid "Ice fog"
+#~ msgstr "얼음 안개"
+
+#~ msgid "Freezing fog"
+#~ msgstr "얼어붙는 안개"
+
+#~ msgid "Light snow"
+#~ msgstr "가랑눈"
+
+#~ msgid "Volcanic ash"
+#~ msgstr "화산재"
+
+#~ msgid "Ash"
+#~ msgstr "재"
+
+#~ msgid "Areas ash"
+#~ msgstr "부분적으로 재"
+
+#~ msgid "Smoke"
+#~ msgstr "연기"
+
+#~ msgid "Patchy ash"
+#~ msgstr "군데군데 재"
+
+#~ msgid "Patchy smoke"
+#~ msgstr "군데군데 연기"
+
+#~ msgid "Areas smoke"
+#~ msgstr "부분적으로 연기"
+
+#~ msgid "Freezing spray"
+#~ msgstr "얼어붙는 이슬비"
+
+#~ msgid "Areas frost"
+#~ msgstr "부분적으로 서리"
+
+#~ msgid "Frost"
+#~ msgstr "서리"
+
+#~ msgid "Chance snow showers"
+#~ msgstr "소낙눈이 내릴 수 있음"
+
+#~ msgid "Snow showers likely"
+#~ msgstr "소낙눈이 내릴 확률 높음"
+
+#~ msgid "Patchy frost"
+#~ msgstr "군데군데 서리"
+
+#~ msgid "Ice crystals"
+#~ msgstr "빙정"
+
+#~ msgid "Areas ice crystals"
+#~ msgstr "부분적으로 빙정"
+
+#~ msgid "Patchy ice crystals"
+#~ msgstr "군데군데 빙정"
+
+#~ msgid "Blizzard"
+#~ msgstr "눈보라"
+
+#~ msgid "Snow/rain likely"
+#~ msgstr "눈/비가 내릴 확률 높음"
+
+#~ msgid "Snow/rain"
+#~ msgstr "눈/비"
+
+#~ msgid "Chance snow/rain"
+#~ msgstr "눈/비가 내릴 수 있음"
+
+#~ msgid "Wintry mix"
+#~ msgstr "비와 섞인 눈"
+
+#~ msgid "Chance wintry mix"
+#~ msgstr "비와 섞인 눈이 내릴 수 있음"
+
+#~ msgid "Wintry mix likely"
+#~ msgstr "비와 섞인 눈이 내릴 확률 높음"
+
+#~ msgid "Chance rain showers"
+#~ msgstr "소나기가 내릴 수 있음"
+
+#~ msgid "Sleet likely"
+#~ msgstr "진눈깨비 내릴 확률 높음"
+
+#~ msgid "Chance snow/sleet"
+#~ msgstr "눈/진눈깨비가 내릴 수 있음"
+
+#~ msgid "Snow/sleet"
+#~ msgstr "눈/진눈깨비"
+
+#~ msgid "Snow/sleet likely"
+#~ msgstr "눈/진눈깨비가 내릴 확률 높음"
+
+#~ msgid "Chance sleet"
+#~ msgstr "진눈깨비 올 수 있음"
+
+#~ msgid "Rain showers likely"
+#~ msgstr "소나기가 내릴 확률 높음"
+
+#~ msgid "Slight chance rain"
+#~ msgstr "낮은 확률로 비가 내릴 수 있음"
+
+#~ msgid "Chance rain"
+#~ msgstr "비가 내릴 수 있음"
+
+#~ msgid "Rain showers"
+#~ msgstr "소나기"
+
+#~ msgid "Rain likely"
+#~ msgstr "비가 내릴 확률 높음"
+
+#~ msgid "Drizzle likely"
+#~ msgstr "이슬비가 내릴 확률 높음"
+
+#~ msgid "Chance drizzle"
+#~ msgstr "이슬비가 내릴 수 있음"
+
+#~ msgid "Slight chance drizzle"
+#~ msgstr "낮은 확률로 이슬비가 내릴 수 있음"
+
+#~ msgid "Heavy rain"
+#~ msgstr "폭우"
+
+#~ msgid "Rain"
+#~ msgstr "비"
+
+#~ msgid "Chance rain/freezing rain"
+#~ msgstr "비/얼어붙는 비가 내릴 수 있음"
+
+#~ msgid "Chance freezing drizzle"
+#~ msgstr "얼어붙는 이슬비가 내릴 수 있음"
+
+#~ msgid "Freezing rain likely"
+#~ msgstr "얼어붙는 비가 내릴 확률 높음"
+
+#~ msgid "Chance freezing rain"
+#~ msgstr "얼어붙는 비가 올 수 있음"
+
+#~ msgid "Slight chance freezing rain"
+#~ msgstr "낮은 확률로 얼어붙는 비가 내릴 수 있음"
+
+#~ msgid "Freezing drizzle likely"
+#~ msgstr "얼어붙는 이슬비가 내릴 확률 높음"
+
+#~ msgid "Slight chance thunderstorms"
+#~ msgstr "낮은 확률로 뇌우가 칠 수 있음"
+
+#~ msgid "Rain/freezing rain likely"
+#~ msgstr "비/얼어붙는 비가 내릴 확률 높음"
+
+#~ msgid "Rain/freezing rain"
+#~ msgstr "비/얼어붙는 비"
+
+#~ msgid "Storm"
+#~ msgstr "폭풍"
+
+#~ msgid "Chance thunderstorms"
+#~ msgstr "뇌우가 칠 수 있음"
+
+#~ msgid "Thunderstorms likely"
+#~ msgstr "뇌우가 칠 확률 높음"
+
+#~ msgid "Water spout"
+#~ msgstr "용 오름"
+
+#~ msgid "Dew Point"
+#~ msgstr "이슬점"
+
+#~ msgid "Sky"
+#~ msgstr "하늘"
+
+#~ msgid "Condition"
+#~ msgstr "기상 상태"
+
+#~ msgid "Humidex"
+#~ msgstr "습도 지수"
+
+#~ msgid "mile(s)"
+#~ msgstr "마일"
+
+#~ msgid "km"
+#~ msgstr "킬로미터"
+
+#~ msgid "Visibility"
+#~ msgstr "시계"
+
+#~ msgid "Wind Chill"
+#~ msgstr "체감 온도"
+
+#~ msgid "Wind Speed"
+#~ msgstr "풍속"
+
+#~ msgid "Wind Direction"
+#~ msgstr "풍향"
+
+#~ msgid "mph"
+#~ msgstr "마일/시"
+
+#~ msgid "mps"
+#~ msgstr "마일/초"
+
+#~ msgid "Connection problem"
+#~ msgstr "연결 오류"
+
+#~ msgid "High: "
+#~ msgstr "최고 기온 : "
+
+#~ msgid "Low: "
+#~ msgstr "최저 기온 : "
+
+#~ msgid "<big>Rungis, France</big>"
+#~ msgstr "<big>프랑스, 헝지스</big>"
+
+#~ msgid "Review your settings"
+#~ msgstr "설정을 확인합니다"
+
+#~ msgid "Label This Location"
+#~ msgstr "이 위치의 이름 설정"
+
+#~ msgid "Is this the place you were looking for?"
+#~ msgstr "이 곳이 찾으시는 장소입니까?"
+
+#~ msgid ""
+#~ "If yes, then you can go on. Otherwise, you'll have to go back and set a new "
+#~ "city."
+#~ msgstr "예를 선택하면 계속 진행합니다. 그렇지 않으면 뒤로 돌아가 다시 도시를 선택하게 됩니다."
+
+#~ msgid "Please select a location from the location tree"
+#~ msgstr "아래 목록에서 위치를 선택해주십시오."
+
+#~ msgid "Confirm the place"
+#~ msgstr "장소 확인"
+
+#~ msgid "Assistant to set up the weather indicator"
+#~ msgstr "날씨 알리미 설정 도우미"
+
+#~ msgid "Add a place"
+#~ msgstr "위치 추가"
+
+#~ msgid ""
+#~ "Would you like to label this location ?\n"
+#~ "If yes, type it below. \n"
+#~ "If no, leave blank and go on."
+#~ msgstr ""
+#~ "이 위치의 이름을 설정하시겠습니까?\n"
+#~ "그런 경우 아래에 입력하십시오.\n"
+#~ "그렇지 않은 경우 다음으로 이동하십시오."
+
+#~ msgid "Review your settings. You may go back and make changes if needed."
+#~ msgstr "설정을 확인합니다. 필요한 경우 뒤로 돌아가 설정을 바꿀 수 있습니다."
+
+#~ msgid ""
+#~ "A weather indicator that displays information for one or multiple places"
+#~ msgstr "한 지역 또는 세계 여러 지역의 정보를 표시하는 날씨 알리미"
+
+#~ msgid "Slight chance snow showers"
+#~ msgstr "낮은 확률로 소낙눈이 내릴 수 있음"
+
+#~ msgid "Slight chance snow/rain"
+#~ msgstr "낮은 확률로 눈/비가 내릴 수 있음"
+
+#~ msgid "Slight chance rain showers"
+#~ msgstr "낮은 확률로 소나기가 내릴 수 있음"
+
+#~ msgid "Slight chance snow/sleet"
+#~ msgstr "낮은 확률로 눈/진눈깨비가 내릴 수 있음"
+
+#~ msgid "Slight chance wintry mix"
+#~ msgstr "낮은 확률로 비와 섞인 눈이 내릴 수 있음"
+
+#~ msgid "Slight chance sleet"
+#~ msgstr "낮은 확률로 진눈깨비가 내릴 수 있음"
+
+#~ msgid "Slight chance freezing drizzle"
+#~ msgstr "낮은 확률로 얼어붙는 이슬비가 내릴 수 있음"
+
+#~ msgid "Slight chance rain/freezing rain"
+#~ msgstr "낮은 확률로 비/얼어붙는 비가 내릴 수 있음"
+
+#~ msgid "Clearing late"
+#~ msgstr "오후 늦게 갬"
+
+#~ msgid "SI (°C)"
+#~ msgstr "국제 단위 (°F)"
+
+#~ msgid "Please select a location from below:"
+#~ msgstr "아래에서 위치를 선택해주십시오."
+
+#~ msgid "If this is not correct, please go back and select a new city."
+#~ msgstr "이 것이 올바르지 않은 경우에는 뒤로 돌아가 새 도시를 선택하십시오."
+
+#~ msgid "Confirm choice"
+#~ msgstr "선택 확인"
+
+#~ msgid "km/h"
+#~ msgstr "킬로미터/시"
+
+#~ msgid "m/s"
+#~ msgstr "미터/초"
+
+#~ msgid "Error retreiving condition"
+#~ msgstr "기상 상태를 가져올 수 없습니다"
+
+#~ msgid "You have selected:"
+#~ msgstr "선택한 옵션 :"
+
+#~ msgid "Kilometers per hour (kph)"
+#~ msgstr "킬로미터/시 (kph)"
+
+#~ msgid "knot(s)"
+#~ msgstr "노트"
+
+#~ msgid "refreshed just now"
+#~ msgstr "지금 막 다시 읽었습니다"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "%s 분 전에 다시 읽었습니다"
+
+#~ msgid "last refreshed just now"
+#~ msgstr "방금 다시 읽었습니다"
+
+#~ msgid "Please input a location in the combobox below:"
+#~ msgstr "아래의 콤보 상자에 위치를 입력해주십시오 :"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/lt.po'
--- po/lt.po	2011-05-20 09:46:56 +0000
+++ po/lt.po	2011-10-19 20:29:25 +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-26 06:38+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@xxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-06-15 01:03+0000\n"
+"Last-Translator: Sigitas Kalinas <skalinas@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Lithuanian <lt@xxxxxx>\n"
 "Language: lt\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-27 05:44+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: lt\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr "Orų prognozė - "
@@ -258,184 +267,600 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Pranešimai</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Temperatūros skalė</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Orų duomenų šaltinis</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Vėjo greičio vienetai</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Boforto"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Įjungti orų indikatoriaus programėlę"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Bendri"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Imperinė (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Mazgai"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Vietovės"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metrai per sekundę (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Mylios per valandą (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Nėra pranešimų"
+
+#: ../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 (metriniai, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Matavimo vienetai"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Atnaujinti kas"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Naudoti pranešimus kiekvienam oro sąlygų pasikeitimui"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Orų indikatoriaus nustatymai"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "min."
+
+#: ../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 "Tornadas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
 msgid "Tropical storm"
 msgstr "Tropinė audra"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Uraganas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
 msgstr "Smarki audra"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Perkūnija"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
 msgstr "Šlapdriba (lietus ir sniegas)"
 
+<<<<<<< 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 "Lietus bei šlapdriba"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
 msgstr "Sniegas bei šlapdriba"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Šąlanti dulksna"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Dulksna"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Šąlantis lietus"
 
+<<<<<<< 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 "Liūtys"
 
+<<<<<<< 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 "Pustomas sniegas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Sniegas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
 msgid "Hail"
 msgstr "Kruša"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
 msgid "Sleet"
 msgstr "Šlapdriba"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Dulkės"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Rūkas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
 msgstr "Migla"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
 msgstr "Dūmai"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
 msgstr "Audringa"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
 msgstr "Vėjuota"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
 msgstr "Šaltis"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
 msgid "Cloudy"
 msgstr "Debesuota"
 
+<<<<<<< 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 "Labai debesuota"
 
+<<<<<<< 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 "Vietomis debesuota"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
 msgstr "Giedra"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Saulėta"
 
+<<<<<<< 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 "Giedra"
 
+<<<<<<< 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 "Karšta"
 
+<<<<<<< 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 "Stipriai sninga"
 
+<<<<<<< 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 "Trumpas lietus su perkūnija"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Itin stipriai sninga"
 
+<<<<<<< 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"
+msgstr "Nežinomos sąlygos"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Drėgmė"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Slėgis"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Temperatūra"
+
+#: ../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 "Vėjas"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Saulėtekis"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Saulėlydis"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "Š"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "ŠR"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "R"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "PR"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "P"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "PV"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "V"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "ŠV"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Nustatyti orus ir vietoves..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Orų prognozė"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Nustatymai..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Apie..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Atnaujinama, prašome palaukti"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Atnaujinti"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "ką tik"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "prieš %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Svarbi informacija apie orus"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Orų indikatorius ir prognozės"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Aurimas Fišeras https://launchpad.net/~aurimas-gmail\n";
+"  Mantas Kriaučiūnas https://launchpad.net/~mantas\n";
+"  Sigitas Kalinas https://launchpad.net/~skalinas";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Orų prognozė - "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Aukšta"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Žema"
+
+#: ../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 "Programa jau yra paleista"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Namai</b>"
+
+#: ../data/ui/Assistant.ui.h:2
+msgid "<b>Orange, Texas</b>"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #: ../data/ui/Assistant.ui:10
 msgid "Add a location"
 msgstr "Pridėti vietovę"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:35
 msgid "Please search our database for your location:"
 msgstr ""
@@ -453,10 +878,25 @@
 msgstr "Įveskite šios vietos pavadinimą:"
 
 #: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Vietovė:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
 msgid "Name the location"
 msgstr "Vietovės pavadinimas"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Įveskite šios vietovės pavadinimą:"
+
+#: ../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 +904,7 @@
 "Peržiūrėkite žemiau esančius pasirinkimus. Jei kas nors jums netinka - "
 "grįžkite atgal ir pasirinkite teisingai."
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr "<b>Namai</b>"
@@ -477,9 +918,17 @@
 msgstr ""
 
 #: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Ieškokite savo vietovės mūsų duomenų bazėje:"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
 msgid "Review choices"
 msgstr "Pasirinkimo apžvalga"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Orų indikatoriaus nustatymai"
@@ -615,3 +1064,121 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Vietos"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Ieškoti"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Pasirinkite vietovę"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Išplėsta orų prognozė"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Orų indikatorius, rodantis orų informaciją bei prognozes vienai ar kelioms "
+"Žemės vietovėms"
+
+#~ msgid "SI (°C)"
+#~ msgstr "SI (°C)"
+
+#~ msgid "Clear sky"
+#~ msgstr "Giedras dangus"
+
+#~ msgid "Increasing clouds"
+#~ msgstr "Debesuotumas didėja"
+
+#~ msgid "Scattered clouds"
+#~ msgstr "Išsisklaidę debesys"
+
+#~ msgid "Decreasing clouds"
+#~ msgstr "Debesuotumas mažėja"
+
+#~ msgid "Broken clouds"
+#~ msgstr "Su pragiedruliais"
+
+#~ msgid "Fog"
+#~ msgstr "Rūkas"
+
+#~ msgid "Dense fog"
+#~ msgstr "Tirštas rūkas"
+
+#~ msgid "Few clouds"
+#~ msgstr "Mažai debesuota"
+
+#~ msgid "Clearing"
+#~ msgstr "Debesys nyksta"
+
+#~ msgid "Overcast"
+#~ msgstr "Debesuota"
+
+#~ msgid "Blowing sand"
+#~ msgstr "Pučiamas smėlis"
+
+#~ msgid "Blowing dust"
+#~ msgstr "Pučiamos dulkės"
+
+#~ msgid "Volcanic ash"
+#~ msgstr "Vulkaniniai pelenai"
+
+#~ msgid "Smoke"
+#~ msgstr "Dūmai"
+
+#~ msgid "Ash"
+#~ msgstr "Pelenai"
+
+#~ msgid "Freezing fog"
+#~ msgstr "Šalantis rūkas"
+
+#~ msgid "Ice crystals"
+#~ msgstr "Ledo kristalai"
+
+#~ msgid "Blizzard"
+#~ msgstr "Pūga"
+
+#~ msgid "Light snow"
+#~ msgstr "Silpnai sninga"
+
+#~ msgid "Snow/rain"
+#~ msgstr "Sniegas, lietus"
+
+#~ msgid "Kilometers per hour (kph)"
+#~ msgstr "Kilometrai per valandą (km/h)"
+
+#~ msgid "knot(s)"
+#~ msgstr "mazgai"
+
+#~ msgid "km/h"
+#~ msgstr "km/h"
+
+#~ msgid "m/s"
+#~ msgstr "m/s"
+
+#~ msgid "mph"
+#~ msgstr "mph"
+
+#~ msgid "refreshed just now"
+#~ msgstr "ką tik atnaujinta"
+
+#~ msgid "last refreshed just now"
+#~ msgstr "paskutinis atnaujinimas ką tik"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "paskutinis atnaujinimas prieš %s min."
+
+#~ msgid "Please input a location in the combobox below:"
+#~ msgstr "Įveskite vietą išskleidžiamajame sąraše žemiau:"
+
+#~ msgid "Show tips in menu"
+#~ msgstr "Rodyti patarimus progrozės meniu"
+
+#~ msgid "Visibility"
+#~ msgstr "Matomumas"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/nb.po'
--- po/nb.po	2011-05-20 09:46:56 +0000
+++ po/nb.po	2011-10-19 20:29:25 +0000
@@ -6,8 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-20 02:26-0700\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2011-05-17 20:04+0000\n"
 "Last-Translator: André Savik <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
@@ -15,9 +20,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-18 06:21+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-06-23 05:53+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: nb\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr "Værvarsel for "
@@ -258,181 +265,597 @@
 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 "Temperaturskala"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "Kilde for værdata"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "Måleenhet for vindhastighet"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Aktivér værvarslings-miniprogrammet"
+
+#: ../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 "Fahrenheit  (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Knop"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Steder"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Meter pr. sekund (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Miles pt. time (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Ingen varslinger"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Bare gi varsling ved melding om ekstremvær"
+
+#: ../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 "Enheter"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Oppdater hver(t)"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Gi varsling om enhver værforandring"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Innstillinger for Værvarsling"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutter"
+
+#: ../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 "Tornado"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
 msgid "Tropical storm"
 msgstr "Tropestorm"
 
+<<<<<<< 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 "Alvorlige tordenvær/-stormer"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Tordenvær/-stormer"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
 msgstr "Sludd"
 
+<<<<<<< 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 "Regn og sludd"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
 msgstr "Sne og sludd"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Frysende yr"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Yr"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Frysende regn"
 
+<<<<<<< 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 "Byger"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
 msgstr "Vindkast/snevær"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
 msgstr "Lett snevær"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Vind/snevær"
 
+<<<<<<< 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 "Sludd"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Støv"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Tåkete"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
 msgstr "Dis"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
 msgstr "Røkfylt"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
 msgstr "Kastevind"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
 msgstr "Vindfylt"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
 msgstr "Kaldt"
 
+<<<<<<< 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 "Mest overskyet"
 
+<<<<<<< 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 "Skiftende skydekke"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
 msgstr "Klar himmel"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Solfylt"
 
+<<<<<<< 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 "Pent"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
 msgstr "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 "Enkelte forekomster av tordenvær"
 
+<<<<<<< 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 "Spredte forekomster av tordenvær"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
 msgstr "Spredte regnbyger"
 
+<<<<<<< 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 "Tungt snevær"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
 msgstr "Spredte snebyger"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
 msgstr "Tordenvær"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Snebyger"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thundershowers"
 msgstr "Enkelte forekomster av regn- og tordenbyger"
 
+<<<<<<< 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 "Luftfuktighet"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Lufttrykk"
+
+#: ../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 ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vind"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Soloppgang"
+
+#: ../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 "Innstillinger for vær..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Værvarsel"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Brukervalg..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr ""
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Oppdaterer, vennligst vent"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: ../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:1436
+msgid "Severe weather alert"
+msgstr "Varsel om ekstremvær"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Værindikator"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  André Savik https://launchpad.net/~asavik";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Værvarsel for "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Høyt"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Lavt"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etikett:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Dette programmet er allerede igang"
+
+#: ../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>Oslo, Norge</b>"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
 msgid "Add a location"
 msgstr "Legg til et nytt sted"
 
@@ -456,7 +879,15 @@
 msgid "Name the location"
 msgstr "Gi stedet et navn"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Vennligst legg inn et navn for stedet"
+
+#: ../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 +895,7 @@
 "Vennligst gå igjennom valgene du har foretatt. Om det er noe som ikke "
 "stemmer, bør du går tilbake og rette det opp."
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr "<b>Hjem</b>"
@@ -477,9 +909,17 @@
 msgstr "<b>Oslo, Norge</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 "Sjekk valgene"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Innstillinger for Værvarsling"
@@ -615,3 +1055,57 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Steder"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr ""
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Velg et sted"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Langtidsvarsel"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Et miniprogram som gir opplysninger om været ett eller flere steder i verden"
+
+#~ msgid "Kilometers per hour (kph)"
+#~ msgstr "Kilometer i timen (km/t)"
+
+#~ msgid "SI (°C)"
+#~ msgstr "SI (°C)"
+
+#~ msgid "Show tips in menu"
+#~ msgstr "Vis hjelp for menyen"
+
+#~ msgid "mph"
+#~ msgstr "miles i timen (m/t)"
+
+#~ msgid "knot(s)"
+#~ msgstr "knop"
+
+#~ msgid "km/h"
+#~ msgstr "km/t"
+
+#~ msgid "refreshed just now"
+#~ msgstr "Nettopp oppdatert"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "Sist oppdatert for %s minutt(er)"
+
+#~ msgid "last refreshed just now"
+#~ msgstr "Sist oppdatert for et øyeblikk siden"
+
+#~ msgid "Please input a location in the combobox below:"
+#~ msgstr "Vennligst finn et sted fra listen under:"
+
+#~ msgid "m/s"
+#~ msgstr "m/s"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/nl.po'
--- po/nl.po	2011-05-20 09:46:56 +0000
+++ po/nl.po	2011-10-19 20:29:25 +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-29 15:32+0000\n"
 "Last-Translator: Ivo <Unknown>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-10-18 12:22+0000\n"
+"Last-Translator: Bernard Decock <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Dutch <nl@xxxxxx>\n"
 "Language: nl\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-30 05:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-10-19 06:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
+"Language: nl\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr "Weersvoorspelling voor "
@@ -258,174 +267,440 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Meldingen</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Temperatuurschaal</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Weer Data Bron</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Windsnelheid Eenheid</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Schakel het Weermeldings Applet in"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Algemeen"
+
+#: ../data/ui/PreferencesDialog.ui.h:8
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Fahrenheit (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr "km/u"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Knopen"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Locaties"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Meter per seconde (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Mijl per uur (mp/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Geen berichten"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Gebruik alleen meldingen om voor extreem weer te waarschuwen"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "Celsius (°C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:18
+msgid "Show temperature near indicator"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Eenheden"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Bijwerken elke"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Gebruik meldingen om elke verandering in het weer te laten zien"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Weer Indicator Instellingen"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minuten"
+
+#: ../bin/indicator-weather.py:463
+msgid "Unknown error occurred while picking up weather data"
+msgstr "Onbekende fout tijdens het ophalen van de weersgegevens"
+
+#: ../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 "Tropische Storm"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Orkaan"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
 msgstr "Zware onweersbuien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Onweersbuien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
-msgstr "Gemixte regen en sneeuw"
+msgstr "Regen en sneeuw"
 
+<<<<<<< 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 "Gemixte regen en ijzel"
+msgstr "Regen en ijzel"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
-msgstr "Gemixte sneeuw en ijzel"
+msgstr "Sneeuw en ijzel"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Motijzel"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Motregen"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
-msgstr "IJskoude regen"
+msgstr "IJzel"
 
+<<<<<<< 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 "Buien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
 msgstr "Sneeuwvlagen"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
 msgstr "Lichte sneeuwbuien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Stuifsneeuw"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Sneeuw"
 
+<<<<<<< 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 "Ijzel"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Stof"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Mistig"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
 msgstr "Mist"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
 msgstr "Rokerig"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
-msgstr "Heftige"
+msgstr "Windstoten"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
 msgstr "Winderig"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
 msgstr "Koud"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
 msgid "Cloudy"
 msgstr "Bewolkt"
 
+<<<<<<< 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 "Overwegend bewolkt"
 
+<<<<<<< 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 "Gedeeltelijk bewolkt"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
 msgstr "Helder"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Zonnig"
 
+<<<<<<< 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 "Schoon"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
-msgstr "Gemixte regen en hagel"
+msgstr "Regen en hagel"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
 msgid "Hot"
 msgstr "Heet"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thunderstorms"
-msgstr "Geïsoleerde onweersbuien"
+msgstr "Lokale onweersbuien"
 
+<<<<<<< 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 "Verspreide onweersbuien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
 msgstr "Verspreide buien"
 
+<<<<<<< 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 "Zware sneeuwval"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
 msgstr "Verspreide buien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
 msgstr "Onweersbuien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Sneeuwbuien"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thundershowers"
+<<<<<<< TREE
 msgstr "Geïsoleerde onweersbuien"
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:106
@@ -433,6 +708,159 @@
 msgstr ""
 
 #: ../data/ui/Assistant.ui:10
+=======
+msgstr "Lokale onweersbuien"
+
+#: ../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 "Onbekende omstandigheden"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Luchtvochtigheid"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Luchtdruk"
+
+#: ../bin/indicator-weather.py:812
+msgid "Temperature"
+msgstr "Temperatuur"
+
+#: ../bin/indicator-weather.py:836 ../bin/indicator-weather.py:837
+#: ../bin/indicator-weather.py:838
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Wind"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Zonsopkomst"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Zonsondergang"
+
+#. Short wind direction - north
+#: ../bin/indicator-weather.py:889
+msgid "N"
+msgstr "N"
+
+#: ../bin/indicator-weather.py:891
+msgid "NE"
+msgstr "NO"
+
+#: ../bin/indicator-weather.py:893
+msgid "E"
+msgstr "Z"
+
+#: ../bin/indicator-weather.py:895
+msgid "SE"
+msgstr "ZO"
+
+#: ../bin/indicator-weather.py:897
+msgid "S"
+msgstr "Z"
+
+#: ../bin/indicator-weather.py:899
+msgid "SW"
+msgstr "ZW"
+
+#: ../bin/indicator-weather.py:901
+msgid "W"
+msgstr "W"
+
+#: ../bin/indicator-weather.py:903
+msgid "NW"
+msgstr "NW"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Stel weergave in"
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Weersverwachting"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Instellingen..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Over..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Verversen, even geduld"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Vernieuwen"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "Onlangs"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. terug"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Extreme weerswaarschuwing"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Weer Indicator"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Bernard Decock https://launchpad.net/~decockbernard\n";
+"  Ivo https://launchpad.net/~van-hoi";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Weersvoorspelling voor "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Hoge"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Lage"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Label:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Een ander deel van dit progromma is al bezig"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Thuis</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 "Voeg een locatie toe"
 
@@ -456,7 +884,15 @@
 msgid "Name the location"
 msgstr "Naam van de locatie"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Voer een naam in voor deze locatie:"
+
+#: ../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 +900,7 @@
 "Controleer de volgende instellingen. Als iets niet klopt, ga dan terug en "
 "verbeter het."
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr "<b>Thuis</b>"
@@ -477,9 +914,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 "Zoek in onze database voor uw locatie"
+
+#: ../data/ui/Assistant.ui.h:10
+>>>>>>> MERGE-SOURCE
 msgid "Review choices"
 msgstr "Controleer uw keuzes"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Weer Indicator Instellingen"
@@ -615,3 +1060,30 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Locaties"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Kies een locatie"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Uitgebreide Weersverwachting"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Een weerindicator die informatie weergeeft voor één of meerdere plaatsen op "
+"de wereld"
+
+#~ msgid "Visibility"
+#~ msgstr "Zichtbaarheid"
+
+#~ msgid "Humidex"
+#~ msgstr "Canadese hitte index"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/pl.po'
--- po/pl.po	2011-05-20 09:46:56 +0000
+++ po/pl.po	2011-10-19 20:29:25 +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-17 06:58+0000\n"
 "Last-Translator: Schlussarz <schlussarz@xxxxxxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-06-27 13:52+0000\n"
+"Last-Translator: Michał Ćwikliński <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Polish <pl@xxxxxx>\n"
 "Language: pl\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-18 06:24+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
@@ -258,184 +266,604 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-06-28 05:31+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: pl\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Prognoza pogody dla "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Najwyższa"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Najniższa"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Poważne ostrzeżenie pogodowe"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Michał Ćwikliński https://launchpad.net/~mcwiklinski\n";
+"  Vadim Rutkovsky https://launchpad.net/~roignac\n";
+"  Wojciech Romatowski https://launchpad.net/~mann78\n";
+"  fioletowyb https://launchpad.net/~fioletowyb";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "błąd"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Ustaw pogodę..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Informacje..."
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Ustawienia..."
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: ../src/service/indicator_weather_service/menu.py:167
+msgid "Warning..."
+msgstr "Ostrzeżenie..."
+
+#: ../src/service/indicator_weather_service/menu.py:233
+msgid "No data available"
+msgstr "Brak dostępnych danych"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Prognoza pogody"
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Odświeżanie"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "proszę czekać"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "przed chwilą"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. temu"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etykieta:"
+
+#: ../src/service/indicator_weather_service/weather.py:221
+msgid "Temperature:"
+msgstr "Temperatura:"
+
+#: ../src/service/indicator_weather_service/weather.py:236
+msgid "Heat index:"
+msgstr "Indeks cieplny:"
+
+#: ../src/service/indicator_weather_service/weather.py:237
+msgid "Heat index"
+msgstr "Indeks cieplny"
+
+#: ../src/service/indicator_weather_service/weather.py:238
+msgid "Temperature and humidity"
+msgstr "Temperatura i wilgotność"
+
+#: ../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 i wilgotność"
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr "Temperatura odczuwalna:"
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr "Temperatura odczuwalna"
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "Temperatura i wiatr"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Temperatura odczuwalna:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Temperatura odczuwalna"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr "Indeks cieplny lub temperatura odczuwalna"
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr "Temperatura odczuwalna:"
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr "Temperatura odczuwalna"
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr "Humidex albo temperatura odczuwalna (Kanada)"
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr "Odczucie"
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr "Odczucie"
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr "Tamperatura, wilgotność i wiatr (Australia)"
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Punkt rosy:"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Punkt rosy"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Wilgotność:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Wilgotność"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Widoczność:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Widoczność"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "Tylko 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 "Wiatr:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Wiatr"
+
+#: ../src/service/indicator_weather_service/weather.py:365
+msgid "Sun:"
+msgstr "Słońce"
+
+#: ../src/service/indicator_weather_service/weather.py:366
+msgid "Sun"
+msgstr "Słońce"
+
+#: ../src/service/indicator_weather_service/weather.py:367
+msgid "Sunrise and sunset"
+msgstr "Wschód i zachód słońca"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Wschód Słońca:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Wschód słońca"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Zachód Słońca:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Zachód słońca"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "Obecnie"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "Dziś"
+
+#: ../bin/indicator-weather.py:551
+>>>>>>> MERGE-SOURCE
 msgid "Tornado"
-msgstr "Huragan"
+msgstr "Tornado"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
 msgid "Tropical storm"
 msgstr "Burza tropikalna"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Huragan"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
 msgstr "Silne burze"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Burze"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
 msgstr "Śnieg z deszczem"
 
+<<<<<<< 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 "Deszcz i deszcz ze śniegiem"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
 msgstr "Śnieg i deszcz ze śniegiem"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Zamarzająca mżawka"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Mżawka"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Zamarzający deszcz"
 
+<<<<<<< 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 "Ulewy"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
 msgstr "Opady śniegu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
 msgstr "Lekkie opady śniegu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Silne opady śniegu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Śnieg"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
 msgid "Hail"
 msgstr "Grad"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
 msgid "Sleet"
 msgstr "Deszcz ze śniegiem"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
-msgstr "Kurz"
+msgstr "Tumany kurzu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Mgliście"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
-msgstr "Zamglenie"
+msgstr "Zamglenia"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
 msgstr "Zadymienie"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
 msgstr "Porywisty wiatr"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
 msgstr "Wietrznie"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
 msgstr "Zimno"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
 msgid "Cloudy"
 msgstr "Pochmurno"
 
+<<<<<<< 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 "Spore zachmurzenie"
 
+<<<<<<< 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 "Częściowe zachmurzenie"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
 msgstr "Bezchmurnie"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Słonecznie"
 
+<<<<<<< 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 "Bezchmurnie"
+msgstr "Ładnie"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
 msgstr "Deszcz z gradem"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
 msgid "Hot"
 msgstr "Upał"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thunderstorms"
-msgstr "Pojedyncze burze"
+msgstr "Sporadyczne burze"
 
+<<<<<<< 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 "Sporadyczne burze"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
-msgstr "Sporadyczne przelotne deszcze"
+msgstr "Przelotne deszcze"
 
+<<<<<<< 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 "Obfity śnieg"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
 msgstr "Sporadyczne opady śniegu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
 msgstr "Krótkie burze"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Przelotne opady śniegu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thundershowers"
 msgstr "Pojedyncze krótkie burze"
 
+<<<<<<< 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 "Nieznane warunki pogodowe"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
 msgid "Add a location"
 msgstr "Dodaj położenie"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:35
 msgid "Please search our database for your location:"
 msgstr ""
@@ -453,10 +881,33 @@
 msgstr "Wprowadź nazwę dla tej lokalizacji:"
 
 #: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Proszę przejrzeć naszą bazę celem znalezienia swojej lokalizacji"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Wyszukaj"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Wybierz położenie"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Wprowadź nazwę dla tej lokalizacji:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
 msgid "Name the location"
 msgstr "Nazwa miejscowości"
 
+<<<<<<< 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 +915,7 @@
 "Proszę sprawdzić czy został dokonany właściwy wybór. Jeśli nie, proszę "
 "wrócić i wybrać właściwe opcje."
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr "<b>Dom</b>"
@@ -477,9 +929,25 @@
 msgstr "<b>Orange, Texas</b>"
 
 #: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Dom</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Położenie:"
+
+#: ../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 "Sprawdzenie wyborów"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Ustawienia powiadamiania o pogodzie"
@@ -615,3 +1083,135 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Miejsca"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Ustawienia powiadamiania o pogodzie"
+
+#: ../data/ui/PreferencesDialog.ui:91
+msgid "<b>Indicator</b>"
+msgstr "<b>wskaźnik</b>"
+
+#: ../data/ui/PreferencesDialog.ui:111
+msgid "Show only weather icon"
+msgstr "Pokaż tylko ikonę"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Pokazuj tylko temperaturę"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "Pokazuj wskaźnik pogody i temperaturę"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Powiadomienia</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Brak powiadomień"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Powiadamiaj tylko o poważnych ostrzeżeń pogodowych"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Powiadamiaj o każdej zmianie warunków pogodowych"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "Zastosuj do wszytskich lokalizacji"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Źródło danych o pogodzie</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 "Aktualizuj co"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minut/y"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Ogólne"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "Pokaż prognozę pogody"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "Pokaż pogodę dla wszystkich lokalizacji"
+
+#: ../data/ui/PreferencesDialog.ui:490
+msgid "Hide irrelevant fields"
+msgstr "Ukryj pola nie mające związku"
+
+#: ../data/ui/PreferencesDialog.ui:520
+msgid "Weather report fields to show"
+msgstr "Pokaż okna z raportem pogodowym"
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "Menu"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Jednostka temperatury</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:9
+msgid "Imperial (°F)"
+msgstr "Imperialne (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:17
+msgid "SI (metric, °C)"
+msgstr "Układ jednostek SI (metryczne, °C)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Jednostka prędkości wiatru</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metry na sekundę (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Mile na godzinę (m/h)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "Kilometry na godzinę (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Stopnie Beauforta"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Węzły"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Jednostki"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Położenia"
+
+#~ msgid "Condition"
+#~ msgstr "Stan pogody"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/pt.po'
--- po/pt.po	2011-05-20 09:46:56 +0000
+++ po/pt.po	2011-10-19 20:29:25 +0000
@@ -6,8 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: weather-indicator\n"
+<<<<<<< TREE
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-20 02:26-0700\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2011-04-26 15:10+0000\n"
 "Last-Translator: Fernando Luís Santos <flsantoscanario@xxxxxxxxx>\n"
 "Language-Team: Portuguese <pt@xxxxxx>\n"
@@ -15,9 +20,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-27 05:45+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: pt\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr ""
@@ -258,181 +265,597 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Escala da Temperatura</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Fonte de dados sobre o tempo</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Unidade de velocidade do vento</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Disponibilizar o applet indicador de tempo"
+
+#: ../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 "Imperial (°F)"
+
+#: ../data/ui/PreferencesDialog.ui.h:10
+msgid "Km per hour (km/h)"
+msgstr ""
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Nós"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Localizações"
+
+#: ../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 "Milhas por hora (mph)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Sem notificações"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Usar as notificações somente em caso de alertas de tempo severo"
+
+#: ../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 "Unidades"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Actualizar a cada"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Utilizar notificações quando as condições atmosféricas mudarem"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Preferências do Indicador de Tempo"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutos"
+
+#: ../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 "Tornado"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
 msgid "Tropical storm"
 msgstr "Tempestade tropical"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Furacão"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
 msgstr "Trovoadas severas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Trovoadas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
 msgstr "Chuva e neve"
 
+<<<<<<< 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 "Chuva e granizo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
 msgstr "Neve e granizo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Chuviscos com gelo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Chuvisco"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Chuva gelada"
 
+<<<<<<< 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 "Aguaçeiros"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
 msgstr "Nevão"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
 msgstr "Queda de neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Neve com vento"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Neve"
 
+<<<<<<< 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 ""
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Pó"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Nevoeiro"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
 msgstr "Neblina"
 
+<<<<<<< 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 "Rajadas"
 
+<<<<<<< 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 "Frio"
 
+<<<<<<< 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 "Maioritariamente 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 "Limpo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Sol"
 
+<<<<<<< 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 "Ameno"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
 msgstr "Chuva e granizo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
 msgid "Hot"
 msgstr "Quente"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thunderstorms"
 msgstr "Trovoadas isoladas"
 
+<<<<<<< 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 "Trovoadas ocasionais"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
 msgstr "Aguaçeiros"
 
+<<<<<<< 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 "Neve forte"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
 msgstr "Nevões ocasionais"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
 msgstr "Aguaçeiros com trovoada"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Neve com chuva"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thundershowers"
 msgstr "Trovoadas isoladas"
 
+<<<<<<< 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 "Humidade"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Pressão"
+
+#: ../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 "Vento"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Nascer do sol"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Pôr-do-sol"
+
+#. 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 "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 "Definir o tempo..."
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr ""
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Preferências..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Sobre ..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "A actualizar, favor aguardar"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "agora mesmo"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "há %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerta de mau 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 ""
+"Launchpad Contributions:\n"
+"  Fernando Luís Santos https://launchpad.net/~flsantos";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Previsão meteorológica para "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Elevada"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Fraco"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Nome:"
+
+#: ../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
+>>>>>>> MERGE-SOURCE
 msgid "Add a location"
 msgstr ""
 
@@ -456,12 +879,21 @@
 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 ""
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr ""
@@ -475,9 +907,17 @@
 msgstr ""
 
 #: ../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 "Preferências do Indicador de Tempo"
@@ -613,3 +1053,50 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Localizações"
+=======
+#: ../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 "Kilometers per hour (kph)"
+#~ msgstr "Kilómetros por hora (kph)"
+
+#~ msgid "SI (°C)"
+#~ msgstr "SI (°C)"
+
+#~ msgid "Show tips in menu"
+#~ msgstr "Mostrar dicas no menu"
+
+#~ msgid "mph"
+#~ msgstr "mph"
+
+#~ msgid "knot(s)"
+#~ msgstr "Nó(s)"
+
+#~ msgid "m/s"
+#~ msgstr "m/s"
+
+#~ msgid "refreshed just now"
+#~ msgstr "atualizado agora"
+
+#, python-format
+#~ msgid "last refreshed %s min. ago"
+#~ msgstr "Actualizado à %s min."
+
+#~ msgid "Humidex"
+#~ msgstr "Humidade"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2011-05-20 09:46:56 +0000
+++ po/pt_BR.po	2011-10-19 20:29:25 +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-05-12 01:52+0000\n"
 "Last-Translator: Sam Samuels <gemini_sam_samuels@xxxxxxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-10-08 22:55+0000\n"
+"Last-Translator: Fábio Ihle <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
 "Language: pt_BR\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-05-13 05:47+0000\n"
 "X-Generator: Launchpad (build 12959)\n"
 
@@ -258,184 +266,605 @@
 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: pt_BR\n"
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Previsão do Tempo para "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Alta"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Baixa"
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alerta severo de clima"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  André Gondim https://launchpad.net/~andregondim\n";
+"  Fitoschido https://launchpad.net/~fitoschido\n";
+"  Fábio Ihle https://launchpad.net/~fabioihle\n";
+"  Gabriell Nascimento https://launchpad.net/~gabriellhrn\n";
+"  Marcos Oliveira da Cruz https://launchpad.net/~marcosoliveiradacruz";
+
+#: ../src/service/indicator_weather_service/__init__.py:53
+#: ../src/service/indicator_weather_service/__init__.py:56
+msgid "error"
+msgstr "erro"
+
+#: ../bin/indicator-weather.py:1074
+msgid "Set Up Weather..."
+msgstr "Configurar Clima..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Sobre..."
+
+#. #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 "Atualizar"
+
+#: ../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 "Nenhum dado disponível"
+
+#: ../src/service/indicator_weather_service/menu.py:340
+msgid "Forecast..."
+msgstr "Previsão..."
+
+#: ../src/service/indicator_weather_service/menu.py:605
+msgid "Refreshing"
+msgstr "Atualizando"
+
+#: ../src/service/indicator_weather_service/menu.py:606
+msgid "please wait"
+msgstr "espere, por favor"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "há pouco"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "%d min. atrás"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Legenda"
+
+#: ../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 e umidade"
+
+#: ../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 e umidade (Canada)"
+
+#: ../src/service/indicator_weather_service/weather.py:256
+msgid "Wind chill:"
+msgstr "Sensação térmica:"
+
+#: ../src/service/indicator_weather_service/weather.py:257
+msgid "Wind chill"
+msgstr "Sensação térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:258
+msgid "Temperature and wind"
+msgstr "Temperatura e vento"
+
+#: ../src/service/indicator_weather_service/weather.py:266
+msgid "Feels like:"
+msgstr "Sensação térmica:"
+
+#: ../src/service/indicator_weather_service/weather.py:267
+msgid "Feels like"
+msgstr "Sensação térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:268
+msgid "Heat index or wind chill"
+msgstr "Índice de calor ou sensação térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:276
+msgid "Feels like (CA):"
+msgstr "Sensação (CA):"
+
+#: ../src/service/indicator_weather_service/weather.py:277
+msgid "Feels like (CA)"
+msgstr "Sensação (CA)"
+
+#: ../src/service/indicator_weather_service/weather.py:278
+msgid "Humidex or wind chill (Canada)"
+msgstr "Humidex ou sensação térmica"
+
+#: ../src/service/indicator_weather_service/weather.py:286
+msgid "Feels like (AU):"
+msgstr "Sensação (AU):"
+
+#: ../src/service/indicator_weather_service/weather.py:287
+msgid "Feels like (AU)"
+msgstr "Sensação (AU)"
+
+#: ../src/service/indicator_weather_service/weather.py:288
+msgid "Temperature, humidity and wind (Australia)"
+msgstr "Temperatura, umidade e vento (Australia)"
+
+#: ../src/service/indicator_weather_service/weather.py:296
+msgid "Dewpoint:"
+msgstr "Ponto de condensação"
+
+#: ../src/service/indicator_weather_service/weather.py:297
+msgid "Dewpoint"
+msgstr "Ponto de condensação"
+
+#: ../src/service/indicator_weather_service/weather.py:305
+msgid "Humidity:"
+msgstr "Humidade:"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Umidade"
+
+#: ../src/service/indicator_weather_service/weather.py:314
+msgid "Visibility:"
+msgstr "Visibilidade:"
+
+#: ../src/service/indicator_weather_service/weather.py:315
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#: ../src/service/indicator_weather_service/weather.py:316
+#: ../src/service/indicator_weather_service/weather.py:338
+msgid "Only from Yahoo!"
+msgstr "Apenas do 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 "Vento:"
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vento"
+
+#: ../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 "Nascer e pôr do sol"
+
+#: ../src/service/indicator_weather_service/weather.py:375
+msgid "Sunrise:"
+msgstr "Nascer do sol:"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Nascer do sol"
+
+#: ../src/service/indicator_weather_service/weather.py:383
+msgid "Sunset:"
+msgstr "Pôr do sol:"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Pôr do sol"
+
+#: ../src/service/indicator_weather_service/weather.py:1283
+msgid "Now:"
+msgstr "Agora:"
+
+#: ../src/service/indicator_weather_service/weather.py:1291
+msgid "Today:"
+msgstr "Hoje:"
+
+#: ../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 "Tempestade Tropical"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Furacão"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
 msgstr "Fortes Tempestades"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
 msgstr "Tempestades"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
 msgstr "Neve intercalada com chuvas"
 
+<<<<<<< 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 "Chuva intercalada com granizo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
 msgstr "Neve intercalada com granizo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Garoa congelada"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Garoa"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Chuva congelada"
 
+<<<<<<< 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 "Pancadas de Chuva"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
 msgstr "Nevascas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
 msgstr "Pontos esparsos de neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
 msgstr "Neve com vento"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Neve"
 
+<<<<<<< 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 "Chuva com Neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Poeira"
 
+<<<<<<< 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 "Cerração"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
 msgstr "Fumaça"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
 msgstr "Rajadas de vento"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
 msgstr "Ventania"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
 msgstr "Frio"
 
+<<<<<<< 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 "Parcialmente 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 "Claro"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Ensolarado"
 
+<<<<<<< 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 "Bom"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
 msgstr "Chuva intercalada com granizo"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
 msgid "Hot"
 msgstr "Calor"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thunderstorms"
 msgstr "Tempestades isoladas"
 
+<<<<<<< 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 "Tempestades Esparsas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
 msgstr "Chuviscos Esparsos"
 
+<<<<<<< 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 "Neve forte"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
 msgstr "Parcialmente nublado"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
-msgstr "Tempestades"
+msgstr "Chuvas com trovoadas"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Quedas de neve"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:105
+=======
+#: ../bin/indicator-weather.py:599
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thundershowers"
 msgstr "Tempestades Isoladas"
 
+<<<<<<< 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 "Condição desconhecida"
+
+#: ../data/ui/Assistant.ui.h:3
+>>>>>>> MERGE-SOURCE
 msgid "Add a location"
 msgstr "Adicionar uma localidade"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:35
 msgid "Please search our database for your location:"
 msgstr ""
@@ -453,10 +882,33 @@
 msgstr "Por favor digite um nome para essa localidade:"
 
 #: ../data/ui/Assistant.ui:137
+=======
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Por favor, procure a sua localização em nosso banco de dados"
+
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Buscar"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Selecionar um localidade"
+
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Por favor digite um nome para essa localidade:"
+
+#: ../data/ui/Assistant.ui.h:6
+>>>>>>> MERGE-SOURCE
 msgid "Name the location"
 msgstr "Nome da Localidade"
 
+<<<<<<< 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 +916,7 @@
 "Por favor revise as escolhas abaixo. Se algo estiver errado, por favor volte "
 "e selecione as opções corretas."
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
 msgstr "<b>Casa</b>"
@@ -477,9 +930,25 @@
 msgstr "<b>Orange, Texas</b>"
 
 #: ../data/ui/Assistant.ui:289
+=======
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Casa</b>"
+
+#: ../data/ui/Assistant.ui.h:5
+msgid "Location:"
+msgstr "Local:"
+
+#: ../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 "Revise suas escolhas"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr "Preferências do Indicador de Clima"
@@ -615,3 +1084,132 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Localizações"
+=======
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Preferências do Indicador de 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 "Mostrar apenas o ícone do tempo"
+
+#: ../data/ui/PreferencesDialog.ui:127
+msgid "Show only temperature"
+msgstr "Mostrar apenas temperatura"
+
+#: ../data/ui/PreferencesDialog.ui:143
+msgid "Show weather icon and temperature"
+msgstr "Mostrar ícone do tempo e temperatura"
+
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Notificações</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Sem notificações"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Somente usar notificações para informar mudanças severas no clima"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Usar notificações para qualquer mudança no clima"
+
+#: ../data/ui/PreferencesDialog.ui:268
+msgid "Apply for all locations"
+msgstr "Aplicar para todos os locais"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "<b>Origem Dos Dados Climáticos </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 "Atualizar a cada"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minutos"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "Geral"
+
+#: ../data/ui/PreferencesDialog.ui:460
+msgid "Show forecast"
+msgstr "Mostrar previsão do tempo"
+
+#: ../data/ui/PreferencesDialog.ui:475
+msgid "Show weather for all locations"
+msgstr "Mostrar tempo para todas as localidades"
+
+#: ../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 de boletim meteorológico para mostrar"
+
+#: ../data/ui/PreferencesDialog.ui:604
+msgid "Menu"
+msgstr "Menu"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "<b>Métrica para Temperatura</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 (Métrico, ºC)"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "<b>Unidade de velocidade do vento</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 "Milhas por hora (m/h)"
+
+#: ../data/ui/PreferencesDialog.ui:755
+msgid "Km per hour (kph)"
+msgstr "Quilômetro por hora (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Nós"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unidades"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Localizações"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/ro.po'
--- po/ro.po	2011-05-20 09:46:56 +0000
+++ po/ro.po	2011-10-19 20:29:25 +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-26 21:55+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@xxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 02:48-0700\n"
+"PO-Revision-Date: 2011-09-29 20:09+0000\n"
+"Last-Translator: Robert Dumitrescu <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Romanian <ro@xxxxxx>\n"
 "Language: ro\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-27 06:27+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-09-30 04:52+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
+"Language: ro\n"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/forecast.py:62
 msgid "Weather Forecast for "
 msgstr ""
@@ -258,174 +267,440 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+#: ../data/ui/PreferencesDialog.ui.h:1
+msgid "<b>Notifications</b>"
+msgstr "<b>Notificări</b>"
+
+#: ../data/ui/PreferencesDialog.ui.h:2
+msgid "<b>Temperature Scale</b>"
+msgstr "Unitate temperatură"
+
+#: ../data/ui/PreferencesDialog.ui.h:3
+msgid "<b>Weather Data Source</b>"
+msgstr "Sursă informații meteo"
+
+#: ../data/ui/PreferencesDialog.ui.h:4
+msgid "<b>Wind Speed Unit</b>"
+msgstr "Unitate viteză vânt"
+
+#: ../data/ui/PreferencesDialog.ui.h:5
+msgid "Beaufort"
+msgstr "Beaufort"
+
+#: ../data/ui/PreferencesDialog.ui.h:6
+msgid "Enable the Weather Indicator Applet"
+msgstr "Activează Weather Indicator Applet"
+
+#: ../data/ui/PreferencesDialog.ui.h:7
+msgid "General"
+msgstr "General"
+
+#: ../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 "Km pe oră (km/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:11
+msgid "Knots"
+msgstr "Noduri"
+
+#: ../data/ui/PreferencesDialog.ui.h:12
+msgid "Locations"
+msgstr "Locații"
+
+#: ../data/ui/PreferencesDialog.ui.h:13
+msgid "Meter per second (m/s)"
+msgstr "Metri pe secundă (m/s)"
+
+#: ../data/ui/PreferencesDialog.ui.h:14
+msgid "Miles per hour (mph)"
+msgstr "Mile pe oră (mi/h)"
+
+#: ../data/ui/PreferencesDialog.ui.h:15
+msgid "No notifications"
+msgstr "Fără notificări"
+
+#: ../data/ui/PreferencesDialog.ui.h:16
+msgid "Only use notifications to give severe weather alerts"
+msgstr "Folosește notificările doar pentru alerte de vreme severă"
+
+#: ../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 "Arată temperatura lângă indicator"
+
+#: ../data/ui/PreferencesDialog.ui.h:19
+msgid "Units"
+msgstr "Unități"
+
+#: ../data/ui/PreferencesDialog.ui.h:20
+msgid "Update every"
+msgstr "Actualizează la fiecare"
+
+#: ../data/ui/PreferencesDialog.ui.h:21
+msgid "Use notifications to give every weather condition change"
+msgstr "Folosește notificările pentru toate schimbările de vreme"
+
+#: ../data/ui/PreferencesDialog.ui.h:22
+msgid "Weather Indicator Preferences"
+msgstr "Preferințe Weather Indicator"
+
+#: ../data/ui/PreferencesDialog.ui.h:23
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../data/ui/PreferencesDialog.ui.h:24
+msgid "minutes"
+msgstr "minute"
+
+#: ../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 "Tornadă"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:58
+=======
+#: ../bin/indicator-weather.py:552
+>>>>>>> MERGE-SOURCE
 msgid "Tropical storm"
 msgstr "Furtună tropicală"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:59
+=======
+#: ../bin/indicator-weather.py:553
+>>>>>>> MERGE-SOURCE
 msgid "Hurricane"
 msgstr "Uragan"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:60
+=======
+#: ../bin/indicator-weather.py:554
+>>>>>>> MERGE-SOURCE
 msgid "Severe thunderstorms"
-msgstr ""
+msgstr "Furtună puternică"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:61
+=======
+#: ../bin/indicator-weather.py:555
+>>>>>>> MERGE-SOURCE
 msgid "Thunderstorms"
-msgstr ""
+msgstr "Furtună"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:62
+=======
+#: ../bin/indicator-weather.py:556
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and snow"
-msgstr ""
+msgstr "Ploaie și ninsoare amestecate"
 
+<<<<<<< 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 "Ploaie și lapoviță amestecate"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:65
+=======
+#: ../bin/indicator-weather.py:559
+>>>>>>> MERGE-SOURCE
 msgid "Mixed snow and sleet"
-msgstr ""
+msgstr "Ninsoare și lapoviță amestecate"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:66
+=======
+#: ../bin/indicator-weather.py:560
+>>>>>>> MERGE-SOURCE
 msgid "Freezing drizzle"
 msgstr "Burniță care îngheață"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:67
+=======
+#: ../bin/indicator-weather.py:561
+>>>>>>> MERGE-SOURCE
 msgid "Drizzle"
 msgstr "Burniță"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:68
+=======
+#: ../bin/indicator-weather.py:562
+>>>>>>> MERGE-SOURCE
 msgid "Freezing rain"
 msgstr "Ploaie cu depunere de polei"
 
+<<<<<<< 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 "Averse"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:71
+=======
+#: ../bin/indicator-weather.py:565
+>>>>>>> MERGE-SOURCE
 msgid "Snow flurries"
-msgstr ""
+msgstr "Fulgi de zăpadă"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:72
+=======
+#: ../bin/indicator-weather.py:566
+>>>>>>> MERGE-SOURCE
 msgid "Light snow showers"
-msgstr ""
+msgstr "Ninsori ușoare"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:73
+=======
+#: ../bin/indicator-weather.py:567
+>>>>>>> MERGE-SOURCE
 msgid "Blowing snow"
-msgstr ""
+msgstr "Zăpadă viscolită"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:74
+=======
+#: ../bin/indicator-weather.py:568
+>>>>>>> MERGE-SOURCE
 msgid "Snow"
 msgstr "Zăpadă"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:75
+=======
+#: ../bin/indicator-weather.py:569
+>>>>>>> MERGE-SOURCE
 msgid "Hail"
 msgstr "Grindină"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:76
+=======
+#: ../bin/indicator-weather.py:570
+>>>>>>> MERGE-SOURCE
 msgid "Sleet"
 msgstr "Lapoviţă"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:77
+=======
+#: ../bin/indicator-weather.py:571
+>>>>>>> MERGE-SOURCE
 msgid "Dust"
 msgstr "Praf"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:78
+=======
+#: ../bin/indicator-weather.py:572
+>>>>>>> MERGE-SOURCE
 msgid "Foggy"
 msgstr "Ceţos"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:79
+=======
+#: ../bin/indicator-weather.py:573
+>>>>>>> MERGE-SOURCE
 msgid "Haze"
 msgstr "Pâclă"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:80
+=======
+#: ../bin/indicator-weather.py:574
+>>>>>>> MERGE-SOURCE
 msgid "Smoky"
-msgstr ""
+msgstr "Fumuriu"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:81
+=======
+#: ../bin/indicator-weather.py:575
+>>>>>>> MERGE-SOURCE
 msgid "Blustery"
-msgstr ""
+msgstr "Rafale de vânt"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:82
+=======
+#: ../bin/indicator-weather.py:576
+>>>>>>> MERGE-SOURCE
 msgid "Windy"
-msgstr ""
+msgstr "Vânt"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:83
+=======
+#: ../bin/indicator-weather.py:577
+>>>>>>> MERGE-SOURCE
 msgid "Cold"
-msgstr ""
+msgstr "Frig"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:84
+=======
+#: ../bin/indicator-weather.py:578
+>>>>>>> MERGE-SOURCE
 msgid "Cloudy"
 msgstr "Înnourat"
 
+<<<<<<< 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 "în mare parte înnourat"
 
+<<<<<<< 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 "Parţial înnourat"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:89
+=======
+#: ../bin/indicator-weather.py:583
+>>>>>>> MERGE-SOURCE
 msgid "Clear"
 msgstr "Clar"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:90
+=======
+#: ../bin/indicator-weather.py:584
+>>>>>>> MERGE-SOURCE
 msgid "Sunny"
 msgstr "Însorit"
 
+<<<<<<< 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 "Rezonabil"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:93
+=======
+#: ../bin/indicator-weather.py:587
+>>>>>>> MERGE-SOURCE
 msgid "Mixed rain and hail"
-msgstr ""
+msgstr "Ploaie și grindină"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:94
+=======
+#: ../bin/indicator-weather.py:588
+>>>>>>> MERGE-SOURCE
 msgid "Hot"
-msgstr ""
+msgstr "Caniculă"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:95
+=======
+#: ../bin/indicator-weather.py:589
+>>>>>>> MERGE-SOURCE
 msgid "Isolated thunderstorms"
-msgstr ""
+msgstr "Furtuni izolate"
 
+<<<<<<< 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 "Furtuni izolate"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:98
+=======
+#: ../bin/indicator-weather.py:592
+>>>>>>> MERGE-SOURCE
 msgid "Scattered showers"
-msgstr ""
+msgstr "Ploi izolate"
 
+<<<<<<< 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 "Ninsoare puternică"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:100
+=======
+#: ../bin/indicator-weather.py:594
+>>>>>>> MERGE-SOURCE
 msgid "Scattered snow showers"
-msgstr ""
+msgstr "Ninsori izolate"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:103
+=======
+#: ../bin/indicator-weather.py:597
+>>>>>>> MERGE-SOURCE
 msgid "Thundershowers"
-msgstr ""
+msgstr "Ploi torențiale"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:104
+=======
+#: ../bin/indicator-weather.py:598
+>>>>>>> MERGE-SOURCE
 msgid "Snow showers"
 msgstr "Averse de ninsoare"
 
+<<<<<<< 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 +708,159 @@
 msgstr ""
 
 #: ../data/ui/Assistant.ui:10
+=======
+msgstr "Ploi torențiale izolate"
+
+#: ../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 "Condiții necunoscute"
+
+#: ../bin/indicator-weather.py:755 ../bin/indicator-weather.py:761
+msgid "Humidity"
+msgstr "Umiditate"
+
+#: ../bin/indicator-weather.py:782
+msgid "Pressure"
+msgstr "Presiune"
+
+#: ../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 ""
+
+#: ../bin/indicator-weather.py:845
+msgid "Wind"
+msgstr "Vânt"
+
+#: ../bin/indicator-weather.py:872
+msgid "Sunrise"
+msgstr "Răsărit"
+
+#: ../bin/indicator-weather.py:876
+msgid "Sunset"
+msgstr "Asfinţit"
+
+#. 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 "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 "Setează vremea"
+
+#: ../bin/indicator-weather.py:1176
+msgid "Forecast"
+msgstr "Prognoză"
+
+#. #Preferences
+#: ../bin/indicator-weather.py:1182
+msgid "Preferences..."
+msgstr "Preferințe..."
+
+#. #About
+#: ../bin/indicator-weather.py:1188
+msgid "About..."
+msgstr "Despre..."
+
+#: ../bin/indicator-weather.py:1289
+msgid "Refreshing, please wait"
+msgstr "Se actualizează, așteptați"
+
+#: ../bin/indicator-weather.py:1291 ../bin/indicator-weather.py:1293
+#: ../bin/indicator-weather.py:1295
+msgid "Refresh"
+msgstr "Actualizează"
+
+#: ../bin/indicator-weather.py:1293
+msgid "just now"
+msgstr "acum"
+
+#: ../bin/indicator-weather.py:1295
+#, python-format
+msgid "%d min. ago"
+msgstr "de %d min."
+
+#: ../bin/indicator-weather.py:1436
+msgid "Severe weather alert"
+msgstr "Alertă vreme severă"
+
+#: ../bin/indicator-weather.py:1454 ../indicator-weather.desktop.in.h:2
+msgid "Weather Indicator"
+msgstr "Indicator vreme"
+
+#: ../bin/indicator-weather.py:1466
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Adi https://launchpad.net/~aditzah-z\n";
+"  Robert Dumitrescu https://launchpad.net/~rc-dumitrescu";
+
+#: ../bin/indicator-weather.py:1684
+msgid "Weather Forecast for "
+msgstr "Prognoza pentru "
+
+#: ../bin/indicator-weather.py:1739
+msgid "High"
+msgstr "Maximă"
+
+#: ../bin/indicator-weather.py:1741
+msgid "Low"
+msgstr "Minimă"
+
+#: ../bin/indicator-weather.py:1842 ../data/ui/Assistant.ui.h:4
+msgid "Label:"
+msgstr "Etichetă:"
+
+#: ../bin/indicator-weather.py:1932
+msgid "Another instance of this program is already running"
+msgstr "Altă instanță a acestui program deja rulează"
+
+#: ../data/ui/Assistant.ui.h:1
+msgid "<b>Home</b>"
+msgstr "<b>Acasă</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 "Adaugă o locație"
 
@@ -456,11 +884,25 @@
 msgid "Name the location"
 msgstr "Numele locației"
 
+<<<<<<< TREE
 #: ../data/ui/Assistant.ui:151
+=======
+#: ../data/ui/Assistant.ui.h:7
+msgid "Please enter a name for this location:"
+msgstr "Introduceți un nume pentru această locație:"
+
+#: ../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 ""
+"Revizuiți alegerile făcute. Dacă ceva nu este în regulă, întoarceți-vă și "
+"selectați valorile corecte."
+
+#: ../data/ui/Assistant.ui.h:9
+msgid "Please search our database for your location:"
+msgstr "Căutați în baza de date locația dumneavoastră:"
 
 #: ../data/ui/Assistant.ui:206
 msgid "<b>Home</b>"
@@ -476,8 +918,9 @@
 
 #: ../data/ui/Assistant.ui:289
 msgid "Review choices"
-msgstr ""
+msgstr "Revizuiți alegerile"
 
+<<<<<<< TREE
 #: ../data/ui/PreferencesDialog.ui:31
 msgid "Weather Indicator Preferences"
 msgstr ""
@@ -613,3 +1056,30 @@
 #: ../data/ui/PreferencesDialog.ui:931
 msgid "Locations"
 msgstr "Locații"
+=======
+#: ../data/ui/Assistant.ui.h:11
+msgid "Search"
+msgstr "Caută"
+
+#: ../data/ui/Assistant.ui.h:12
+msgid "Select a location"
+msgstr "Selectați o locație"
+
+#: ../data/ui/ExtendedForecast.ui.h:1
+msgid "Extended Forecast"
+msgstr "Prognoză extinsă"
+
+#: ../indicator-weather.desktop.in.h:1
+msgid ""
+"A weather indicator that displays information for one or multiple places in "
+"the world"
+msgstr ""
+"Un indicator pentru vreme care afișează informații pentru una sau mai multe "
+"locații de pe glob"
+
+#~ msgid "Humidex"
+#~ msgstr "Temperatura resimțită"
+
+#~ msgid "Visibility"
+#~ msgstr "Vizibilitate"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/ru.po'
--- po/ru.po	2011-05-20 09:46:56 +0000
+++ po/ru.po	2011-10-19 20:29:25 +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-09 23:30+0000\n"
 "Last-Translator: Vadim Rutkovsky <roignac@xxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-20 02:26-0700\n"
+"PO-Revision-Date: 2011-09-25 01:31+0000\n"
+"Last-Translator: Aleksandr Tishin <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Russian <ru@xxxxxx>\n"
 "Language: ru\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,184 +266,605 @@
 msgstr ""
 
 #: ../src/service/indicator_weather_service/providers/yahoo.py:57
+=======
+"X-Launchpad-Export-Date: 2011-09-26 04:54+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+"Language: ru\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"
+"  Aleksandr Tishin https://launchpad.net/~mystic-mirage\n";
+"  Evgeny https://launchpad.net/~evgeny-ig\n";
+"  Ilis https://launchpad.net/~ilis\n";
+"  Vadim Rutkovsky https://launchpad.net/~roignac\n";
+"  mastergrig https://launchpad.net/~mastergrig90";
+
+#: ../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 "Только от Yahoo!"
+
+#: ../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 "Тропический шторм"
 
+<<<<<<< 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 "Дождь со снегом"
+msgstr "Снег с дождём"
 
+<<<<<<< TREE
 #: ../src/service/indicator_weather_service/providers/yahoo.py:64
+=======
+#. Use American meaning of sleet - see http://en.wikipedia.org/wiki/Sleet
+#