Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505a

Conflicts:
	Android.mk

Change-Id: Ia371e5e2b34d8e5e69438ab5417bec5514366fa3

11 files changed, 426 insertions, 63 deletions

diff --git a/Android.mk b/Android.mk
index 7809d91..e73bb89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,9 +33,5 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms
 
 LOCAL_STATIC_JAVA_LIBRARIES := play
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    play:../../../external/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar
 
 include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1ac6b49..62d24e3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -117,7 +117,7 @@
   <string name="weather_use_metric">Utilitza el sistema mètric</string>
   <string name="weather_retrieve_location_dialog_title">No es pot aconseguir la ubicació!</string>
   <string name="weather_retrieve_location_dialog_message">La geolocalització per xarxa està desactivada.\n\nEstableix una ubicació personalitzada o activa la ubicació per xarxa</string>
-  <string name="weather_retrieve_location_dialog_enable_button">Activat</string>
+  <string name="weather_retrieve_location_dialog_enable_button">Activa</string>
   <string name="weather_invert_lowhigh">Inverteix temp. mín/màx</string>
   <string name="weather_progress_title">Verificant ubicació</string>
   <string name="weather_alternate_icons_title">Utilitza icones de color</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 230dcba..365d4bc 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,18 +23,18 @@
   <string name="weather_0">竜巻</string>
   <string name="weather_1">熱帯暴風雨</string>
   <string name="weather_2">ハリケーン</string>
-  <string name="weather_3">激しい雷雨</string>
-  <string name="weather_4">雷雨</string>
+  <string name="weather_3">非常に激しい雷雨</string>
+  <string name="weather_4">激しい雷雨</string>
   <string name="weather_5">雨と雪</string>
   <string name="weather_6">雨とみぞれ</string>
   <string name="weather_7">雪とみぞれ</string>
   <string name="weather_8">着氷性の霧雨</string>
   <string name="weather_9">霧雨</string>
   <string name="weather_10">着氷性の雨</string>
-  <string name="weather_11">にわか雨</string>
-  <string name="weather_12">にわか雨</string>
+  <string name="weather_11">小雨</string>
+  <string name="weather_12">小雨</string>
   <string name="weather_13">驟雪</string>
-  <string name="weather_14">軽いにわか雪</string>
+  <string name="weather_14">軽い小雪</string>
   <string name="weather_15">吹雪</string>
   <string name="weather_16">雪</string>
   <string name="weather_17">雹</string>
@@ -47,26 +47,26 @@
   <string name="weather_24">強風</string>
   <string name="weather_25">寒冷</string>
   <string name="weather_26">曇り</string>
-  <string name="weather_27">曇りのち晴れ</string>
-  <string name="weather_28">曇りのち晴れ</string>
-  <string name="weather_29">晴れ時々曇り</string>
-  <string name="weather_30">晴れ時々曇り</string>
+  <string name="weather_27">曇のち晴</string>
+  <string name="weather_28">曇のち晴</string>
+  <string name="weather_29">晴時々曇</string>
+  <string name="weather_30">晴時々曇</string>
   <string name="weather_31">快晴</string>
   <string name="weather_32">晴れ</string>
   <string name="weather_33">晴れ</string>
   <string name="weather_34">晴れ</string>
   <string name="weather_35">雨と雹</string>
   <string name="weather_36">温暖</string>
-  <string name="weather_37">局地的雷雨</string>
-  <string name="weather_38">所により雷雨</string>
-  <string name="weather_39">所により雷雨</string>
-  <string name="weather_40">所によりにわか雨</string>
+  <string name="weather_37">局地的な激しい雷雨</string>
+  <string name="weather_38">ところにより激しい雷雨</string>
+  <string name="weather_39">ところにより激しい雷雨</string>
+  <string name="weather_40">ところにより小雨</string>
   <string name="weather_41">大雪</string>
-  <string name="weather_42">所によりにわか雪</string>
+  <string name="weather_42">ところにより小雪</string>
   <string name="weather_43">大雪</string>
-  <string name="weather_44">晴れ時々曇り</string>
+  <string name="weather_44">晴時々曇</string>
   <string name="weather_45">雷雨</string>
-  <string name="weather_46">にわか雪</string>
+  <string name="weather_46">小雪</string>
   <string name="weather_47">局地的雷雨</string>
   <string name="weather_kph">km/h</string>
   <string name="weather_mph">m/h</string>
@@ -109,7 +109,7 @@
   <string name="weather_use_custom_location">カスタムの場所を使用</string>
   <string name="weather_geolocated">ネットワークを使用して現在地を取得する</string>
   <string name="weather_custom_location_dialog_title">場所を入力</string>
-  <string name="weather_custom_location_hint">国、県、市町村</string>
+  <string name="weather_custom_location_hint">国、都道府県、市町村</string>
   <string name="weather_custom_location_title">場所</string>
   <string name="weather_show_location_title">場所を表示</string>
   <string name="weather_show_timestamp_title">更新日時を表示</string>
@@ -162,7 +162,7 @@
   <string name="holo_green_light">ライトグリーン</string>
   <string name="holo_red_light">ライトレッド</string>
   <string name="holo_blue_dark">ダークブルー</string>
-  <string name="holo_green_dark">ダークグレー</string>
+  <string name="holo_green_dark">ダークグリーン</string>
   <string name="holo_red_dark">ダークレッド</string>
   <string name="holo_purple">パープル</string>
   <string name="holo_orange_light">ライトオレンジ</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cd9cb06..8c50d52 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -84,12 +84,12 @@
   <string name="weather_last_sync_just_now">Ką tik</string>
   <string name="weather_cannot_reach_provider">Negali pasiekti %s</string>
   <string name="weather_refresh_manual">Rankiniu būdu</string>
-  <string name="weather_refresh_30min">30 minučių</string>
-  <string name="weather_refresh_60min">60 minučių</string>
-  <string name="weather_refresh_2hrs">2 valandos</string>
-  <string name="weather_refresh_4hrs">4 valandos</string>
-  <string name="weather_refresh_6hrs">6 valandos</string>
-  <string name="weather_refresh_8hrs">8 valandos</string>
+  <string name="weather_refresh_30min">30 min.</string>
+  <string name="weather_refresh_60min">60 min.</string>
+  <string name="weather_refresh_2hrs">2 val.</string>
+  <string name="weather_refresh_4hrs">4 val.</string>
+  <string name="weather_refresh_6hrs">6 val.</string>
+  <string name="weather_refresh_8hrs">8 val.</string>
   <string name="clock_category">Laikrodis ir žadintuvas</string>
   <string name="weather_category">Orų skydelis</string>
   <string name="calendar_category">Kalendoriaus įvykiai</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
new file mode 100644
index 0000000..e7b5797
--- /dev/null
+++ b/res/values-ro/strings.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod Project (DvTonder)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Necunoscut</string>
+  <string name="cancel">Revocați</string>
+  <string name="loading_indicator">Încărcare widget\u2026</string>
+  <string name="menu_done">OK</string>
+  <string name="weather_0">Tornadă</string>
+  <string name="weather_1">Furtună</string>
+  <string name="weather_2">Uragan</string>
+  <string name="weather_3">Furtuni severe</string>
+  <string name="weather_4">Furtuni</string>
+  <string name="weather_5">Lapoviță</string>
+  <string name="weather_6">Lapoviță</string>
+  <string name="weather_7">Ninsoare umedă</string>
+  <string name="weather_8">Chiciură</string>
+  <string name="weather_9">Burniță</string>
+  <string name="weather_10">Polei</string>
+  <string name="weather_11">Averse</string>
+  <string name="weather_12">Averse</string>
+  <string name="weather_13">Rafale de zăpadă</string>
+  <string name="weather_14">Ninsoare slabă</string>
+  <string name="weather_15">Viscol</string>
+  <string name="weather_16">Ninsoare</string>
+  <string name="weather_17">Grindină</string>
+  <string name="weather_18">Lapoviță</string>
+  <string name="weather_19">Praf</string>
+  <string name="weather_20">Ceață</string>
+  <string name="weather_21">Ceață</string>
+  <string name="weather_22">Fum</string>
+  <string name="weather_23">Furtună</string>
+  <string name="weather_24">Vânt</string>
+  <string name="weather_25">Rece</string>
+  <string name="weather_26">Înnorat</string>
+  <string name="weather_27">Înnorat</string>
+  <string name="weather_28">Înnorat</string>
+  <string name="weather_29">Parțial înnorat</string>
+  <string name="weather_30">Parțial înnorat</string>
+  <string name="weather_31">Senin</string>
+  <string name="weather_32">Însorit</string>
+  <string name="weather_33">Senin</string>
+  <string name="weather_34">Senin</string>
+  <string name="weather_35">Ploaie cu grindină</string>
+  <string name="weather_36">Cald</string>
+  <string name="weather_37">Furtuni izolate</string>
+  <string name="weather_38">Furtuni dispersate</string>
+  <string name="weather_39">Furtuni dispersate</string>
+  <string name="weather_40">Ploi ușoare</string>
+  <string name="weather_41">Ninsoare puternică</string>
+  <string name="weather_42">Ninsori dispersate</string>
+  <string name="weather_43">Ninsoare puternică</string>
+  <string name="weather_44">Parțial noros</string>
+  <string name="weather_45">Descărcări electrice</string>
+  <string name="weather_46">Averse de ninsoare</string>
+  <string name="weather_47">Descărcări electrice izolate</string>
+  <string name="weather_kph">km/h</string>
+  <string name="weather_mph">ml/h</string>
+  <string name="weather_N">N</string>
+  <string name="weather_NE">NE</string>
+  <string name="weather_E">E</string>
+  <string name="weather_SE">SE</string>
+  <string name="weather_S">S</string>
+  <string name="weather_SW">SV</string>
+  <string name="weather_W">V</string>
+  <string name="weather_NW">NV</string>
+  <string name="weather_no_data">Nu există date</string>
+  <string name="weather_tap_to_refresh">Apăsați pentru actualizare</string>
+  <string name="weather_refreshing">Actualizare</string>
+  <string name="weather_last_sync_just_now">Acum</string>
+  <string name="weather_cannot_reach_provider">Meteo indisponibil</string>
+  <string name="weather_refresh_manual">Manual</string>
+  <string name="weather_refresh_30min">30 minute</string>
+  <string name="weather_refresh_60min">60 minute</string>
+  <string name="weather_refresh_2hrs">2 ore</string>
+  <string name="weather_refresh_4hrs">4 ore</string>
+  <string name="weather_refresh_6hrs">6 ore</string>
+  <string name="weather_refresh_8hrs">8 ore</string>
+  <string name="clock_category">Ceas și alarmă</string>
+  <string name="weather_category">Panou meteo</string>
+  <string name="calendar_category">Evenimente din calendar</string>
+  <string name="general_category">General</string>
+  <string name="display_category">Afișare</string>
+  <string name="use_digital_clock_title">Utilizați ceasul Digital</string>
+  <string name="use_digital_clock_summary">Selectați pentru a comuta între ceasul Digital și cel Analogic</string>
+  <string name="clock_font_title">Font oră îngroșat</string>
+  <string name="clock_font_minutes_title">Font minute îngroșat</string>
+  <string name="clock_font_date_title">Font dată și alarmă îngroșat</string>
+  <string name="show_alarm_title">Afișare următoarea alarmă</string>
+  <string name="clock_am_pm_title">Afișare indicator AM/PM</string>
+  <string name="weather_enabled">Activat</string>
+  <string name="weather_enable">Afișare meteo</string>
+  <string name="weather_source_title">Sursă meteo</string>
+  <string name="weather_source_yahoo">Yahoo! Meteo</string>
+  <string name="weather_use_custom_location">Locație personalizată</string>
+  <string name="weather_geolocated">Localizare utilizând rețeaua</string>
+  <string name="weather_custom_location_dialog_title">Introduceți locația</string>
+  <string name="weather_custom_location_hint">Oraș, Stat/Țară</string>
+  <string name="weather_custom_location_title">Locație</string>
+  <string name="weather_show_location_title">Afișare locație</string>
+  <string name="weather_show_timestamp_title">Afișare marcaj de timp</string>
+  <string name="weather_refresh_interval">Interval actualizare</string>
+  <string name="weather_use_metric">Sistem metric</string>
+  <string name="weather_retrieve_location_dialog_title">Nu se poate prelua locația!</string>
+  <string name="weather_retrieve_location_dialog_message">Geolocalizarea este dezactivată.\n\nSetați o locație personalizată sau activați localizarea în rețea</string>
+  <string name="weather_retrieve_location_dialog_enable_button">Activată</string>
+  <string name="weather_invert_lowhigh">Inversare temperaturi min/max</string>
+  <string name="weather_progress_title">Verificare locație</string>
+  <string name="weather_alternate_icons_title">Pictograme alternative</string>
+  <string name="weather_alternate_icons_summary">Comutare între pictogramele prestabilite (colore) și cele alternative (albe)</string>
+  <string name="weather_show_when_minimized_title">Afișare minimizat</string>
+  <string name="weather_show_when_minimized_summary">Afișare informație meteo sumară cănd widget-ul este minimizat</string>
+  <string name="weather_select_location">Selectați locația</string>
+  <string name="calendar_title">Afișare eveniment următor</string>
+  <string name="calendars_title">Calendare</string>
+  <string name="calendars_summary">Afișare evenimente din calendarul selectat</string>
+  <string name="calendar_reminders_only_title">Numai cu memento-uri</string>
+  <string name="calendar_reminders_only_summary">Afișare doar evenimente cu memento-uri</string>
+  <string name="calendar_hide_allday_title">Ascundere evenimente pt. toată ziua</string>
+  <string name="calendar_icon_title">Pictogramă Calendar</string>
+  <string name="calendar_lookahead_title">Perioadă eveniment</string>
+  <string name="calendar_show_location_title">Locație eveniment</string>
+  <string name="calendar_show_description_title">Descriere eveniment</string>
+  <string name="calendar_upcoming_events_category">Următoarele evenimente</string>
+  <string name="calendar_highlight_upcoming_events_title">Evidențiere elemente</string>
+  <string name="calendar_highlight_upcoming_events_summary">Evenimente din ziua curentă, iar după 20:00, și cele din ziua următoare</string>
+  <string name="calendar_highlight_upcoming_events_bold">Font îngroșat</string>
+  <string name="font_color">Culoare font</string>
+  <string name="font_color_alarm">Culoare font alarmă</string>
+  <string name="font_color_timestamp">Culoare font marcaj de timp</string>
+  <string name="font_color_calendar_details">Detalii culoare font</string>
+  <string name="calendar_lookahead_3hrs">3 ore</string>
+  <string name="calendar_lookahead_6hrs">6 ore</string>
+  <string name="calendar_lookahead_12hrs">12 ore</string>
+  <string name="calendar_lookahead_today">Astăzi</string>
+  <string name="calendar_lookahead_1day">1 zi</string>
+  <string name="calendar_lookahead_3days">3 zile</string>
+  <string name="calendar_lookahead_1wk">1 săptămână</string>
+  <string name="calendar_lookahead_2wks">2 săptămâni</string>
+  <string name="calendar_lookahead_4wks">4 săptămâni</string>
+  <string name="calendar_metadata_none">Nu se afișează</string>
+  <string name="calendar_metadata_first_line">Afișare primul rând</string>
+  <string name="calendar_metadata_all">Afișare totală</string>
+  <string name="white">Alb</string>
+  <string name="grey">Gri</string>
+  <string name="black">Negru</string>
+  <string name="holo_blue_light">Albastru deschis</string>
+  <string name="holo_green_light">Verde deschis</string>
+  <string name="holo_red_light">Roșu deschis</string>
+  <string name="holo_blue_dark">Albastru închis</string>
+  <string name="holo_green_dark">Verde închis</string>
+  <string name="holo_red_dark">Roșu închis</string>
+  <string name="holo_purple">Purpuriu</string>
+  <string name="holo_orange_light">Portocaliu deschis</string>
+  <string name="holo_orange_dark">Portocaliu închis</string>
+  <string name="holo_blue_bright">Albastru aprins</string>
+  <string name="weather_icon_set_title">Pictograme</string>
+  <string name="weather_icons_standard">Color</string>
+  <string name="weather_icons_monochrome">Monocrom</string>
+  <string name="icon_set_selection_get_more">Mai multe\u2026</string>
+</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
new file mode 100644
index 0000000..c5d037f
--- /dev/null
+++ b/res/values-si/strings.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod Project (DvTonder)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">නොදනී</string>
+  <string name="cancel">අවලංගුයි</string>
+  <string name="loading_indicator">විජටය පූරණයවෙමින්\u2026</string>
+  <string name="menu_done">හරි</string>
+  <string name="weather_0">ටෝනාඩෝව</string>
+  <string name="weather_1">නිවර්තන කුණාටුව</string>
+  <string name="weather_2">චණ්ඩමාරුතය</string>
+  <string name="weather_3">රළු අකුණු කුණාටු</string>
+  <string name="weather_4">අකුණු කුණාටු</string>
+  <string name="weather_5">හිම මිශ්‍රිත වැස්ස</string>
+  <string name="weather_6">ශීත මිශ්‍රිත වැස්ස</string>
+  <string name="weather_7">හිම මිශ්‍රිත ශීතකර වැස්ස</string>
+  <string name="weather_8">ඉතා ශීතල හිරිකඩ</string>
+  <string name="weather_9">හිරිකඩ</string>
+  <string name="weather_10">ඉතා ශීතල වැස්ස</string>
+  <string name="weather_11">නොකඩවා වැසි</string>
+  <string name="weather_12">නොකඩවා වැසි</string>
+  <string name="weather_13">හදිසි ලිහිල් හිම වැසි</string>
+  <string name="weather_14">නොකඩවා ලිහිල් හිම වැසි</string>
+  <string name="weather_15">හමන හිම</string>
+  <string name="weather_16">හිම</string>
+  <string name="weather_17">හිම කැට වැස්ස</string>
+  <string name="weather_18">ශීතකර වැස්ස</string>
+  <string name="weather_19">දූවිල්ල</string>
+  <string name="weather_20">මීදුමෙන් වැසුණු</string>
+  <string name="weather_21">තුනී මීදුම</string>
+  <string name="weather_22">නොපැහැදිලි</string>
+  <string name="weather_23">කුණාටු සහිත</string>
+  <string name="weather_24">සුළං සහිත</string>
+  <string name="weather_25">සීතල</string>
+  <string name="weather_26">වලාකුළින් වැසුණු</string>
+  <string name="weather_27">වැඩිවශයෙන් වලාකුළින් වැසුණු</string>
+  <string name="weather_28">වැඩිවශයෙන් වලාකුළින් වැසුණු</string>
+  <string name="weather_29">අඩවශයෙන් වලාකුළින් වැසුණු</string>
+  <string name="weather_30">අඩවශයෙන් වලාකුළින් වැසුණු</string>
+  <string name="weather_31">පැහැදිලි</string>
+  <string name="weather_32">ප්‍රබෝධමත්</string>
+  <string name="weather_33">වැසි නැති</string>
+  <string name="weather_34">වැසි නැති</string>
+  <string name="weather_35">හිම කැට මිශ්‍රිත වැස්ස</string>
+  <string name="weather_36">උණුසුම්</string>
+  <string name="weather_37">ඒකලිත අකුණු කුණාටු</string>
+  <string name="weather_38">විසිරුන අකුණු කුණාටු</string>
+  <string name="weather_39">විසිරුන අකුණු කුණාටු</string>
+  <string name="weather_40">නොකඩවා විසිරුන වැසි</string>
+  <string name="weather_41">අධික හිම</string>
+  <string name="weather_42">නොකඩවා විසිරුන හිම වැසි</string>
+  <string name="weather_43">අධික හිම</string>
+  <string name="weather_44">අඩවශයෙන් වලාකුළින් වැසුණු</string>
+  <string name="weather_45">ගිගුරුම් සහිත වැසි</string>
+  <string name="weather_46">නොකඩවා හිම වැසි</string>
+  <string name="weather_47">ඒකලිත ගිගුරුම් සහිත වැසි</string>
+  <string name="weather_kph">kph</string>
+  <string name="weather_mph">mph</string>
+  <string name="weather_N">උතුර</string>
+  <string name="weather_NE">ඊශාන</string>
+  <string name="weather_E">නැගෙනහිර</string>
+  <string name="weather_SE">ගිනිකොන</string>
+  <string name="weather_S">දකුණ</string>
+  <string name="weather_SW">නිරිත</string>
+  <string name="weather_W">බටහිර</string>
+  <string name="weather_NW">වයඹ</string>
+  <string name="weather_no_data">දත්ත නැත</string>
+  <string name="weather_tap_to_refresh">නැවුම්කිරීමට තට්ටු කරන්න</string>
+  <string name="weather_refreshing">නැවුම්කරමින්</string>
+  <string name="weather_last_sync_just_now">මේදැන්</string>
+  <string name="weather_cannot_reach_provider">මෙම මොහොතේ %s වෙත ළඟා වියනොහැක</string>
+  <string name="weather_refresh_manual">හස්තීය</string>
+  <string name="weather_refresh_30min">මිනිත්තු 30</string>
+  <string name="weather_refresh_60min">මිනිත්තු 60</string>
+  <string name="weather_refresh_2hrs">පැය 2</string>
+  <string name="weather_refresh_4hrs">පැය 4</string>
+  <string name="weather_refresh_6hrs">පැය 6</string>
+  <string name="weather_refresh_8hrs">පැය 8</string>
+  <string name="clock_category">ඔරලෝසුව සහ ඇඟවීම</string>
+  <string name="weather_category">කාලගුණ පුවරුව</string>
+  <string name="calendar_category">දින දර්ශක සිදුවීම්</string>
+  <string name="general_category">ප්‍රධාන</string>
+  <string name="display_category">සංදර්ශකය</string>
+  <string name="use_digital_clock_title">සංඛ්‍යාංක ඔරලෝසුව භාවිතාකරන්න</string>
+  <string name="use_digital_clock_summary">සංඛ්‍යාංක සහ ප්‍රතිසම ඔරලෝසුව අතර ටොගලනය සඳහා තෝරන්න</string>
+  <string name="clock_font_title">තදකුරු පැය</string>
+  <string name="clock_font_minutes_title">තදකුරු මිනිත්තු</string>
+  <string name="clock_font_date_title">තදකුරු දිනය සහ ඇඟවීම</string>
+  <string name="show_alarm_title">ඊළඟ ඇඟවීම පෙන්වන්න</string>
+  <string name="clock_am_pm_title">පෙ.ව./ප.ව. දර්ශකය පෙන්වන්න</string>
+  <string name="weather_enabled">සබලයි</string>
+  <string name="weather_enable">කාලගුණය පෙන්වන්න</string>
+  <string name="weather_source_title">කාලගුණ මූලාශ්‍රය</string>
+  <string name="weather_source_yahoo">යාහූ! කාලගුණය</string>
+  <string name="weather_use_custom_location">රීසිවූ ස්ථානයක් භාවිතාකරන්න</string>
+  <string name="weather_geolocated">භූගෝලීය ස්ථානය ජාල භාවිතයෙන්</string>
+  <string name="weather_custom_location_dialog_title">ස්ථානය ඇතුල් කරන්න</string>
+  <string name="weather_custom_location_hint">නගරය, ජනපදය/රට</string>
+  <string name="weather_custom_location_title">ස්ථානය</string>
+  <string name="weather_show_location_title">ස්ථානය පෙන්වන්න</string>
+  <string name="weather_show_timestamp_title">කාල මුද්‍රාව පෙන්වන්න</string>
+  <string name="weather_refresh_interval">යාවත්කාල විරාමය</string>
+  <string name="weather_use_metric">මීටර ක්‍රමය භාවිතාකරන්න</string>
+  <string name="weather_retrieve_location_dialog_title">ස්ථානය සොයා ලබාගත නොහැක!</string>
+  <string name="weather_retrieve_location_dialog_message">ජාලමය භූගෝලීය ස්ථානය අබලකර ඇත.\n\nරිසිවූ ස්ථානයක් නියම කරන්න නැතිනම් ජාලමය ස්ථානය සබල කරන්න</string>
+  <string name="weather_retrieve_location_dialog_enable_button">සබලයි</string>
+  <string name="weather_invert_lowhigh">පහත්/උස් උෂ්ණත්ව යටිකුරු කරන්න</string>
+  <string name="weather_progress_title">ස්ථානය සත්‍යාපනය කරමින්</string>
+  <string name="weather_alternate_icons_title">පාට අයිකන භාවිතාකරන්න</string>
+  <string name="weather_alternate_icons_summary">පෙරනිමි (පාට) සහ විකල්ප (සුදු) අයිකන අතර ටොගලනයට තෝරන්න</string>
+  <string name="weather_show_when_minimized_title">හකුලා ඇතිවිට පෙන්වන්න</string>
+  <string name="weather_show_when_minimized_summary">විජටය හකුලා ඇතිවිට සංක්ෂිප්ත කාලගුණ තොරතුරු පෙන්වන්න</string>
+  <string name="weather_select_location">ස්ථානය තෝරන්න</string>
+  <string name="calendar_title">ඊළඟ සිදුවීම පෙන්වන්න</string>
+  <string name="calendars_title">සිදුවීම් දින දර්ශක</string>
+  <string name="calendars_summary">මෙම දින දර්ශක මගින් සිදුවීම් සොයන්න</string>
+  <string name="calendar_reminders_only_title">මතක්කිරීම් පමණි</string>
+  <string name="calendar_reminders_only_summary">මතක්කිරීම් සහිත සිදුවීම් පමණක් පෙන්වන්න</string>
+  <string name="calendar_hide_allday_title">දවසපුරා සිදුවීම් සඟවන්න</string>
+  <string name="calendar_icon_title">දින දර්ශක අයිකනය</string>
+  <string name="calendar_lookahead_title">ඉදිරි සිදුවීම් බැලීම</string>
+  <string name="calendar_show_location_title">සිදුවීමේ ස්ථානය</string>
+  <string name="calendar_show_description_title">සිදුවීමේ විස්තරය</string>
+  <string name="calendar_upcoming_events_category">ඉදිරියට පැමිණෙන සිදුවීම්</string>
+  <string name="calendar_highlight_upcoming_events_title">සිදුවීම් ඉස්මතු කරන්න</string>
+  <string name="calendar_highlight_upcoming_events_summary">අදදින සිදුවීම් සහ, ප.ව. 8න් පසුව, ඊළඟ දිනයේ සිදුවීම්ද ඉස්මතු කරන්න</string>
+  <string name="calendar_highlight_upcoming_events_bold">තදකුරු ෆොන්ටය</string>
+  <string name="font_color">ෆොන්ටයේ පාට</string>
+  <string name="font_color_alarm">ඇඟවීම් ෆොන්ටයේ පාට</string>
+  <string name="font_color_timestamp">කාල මුද්‍රා ෆොන්ටයේ පාට</string>
+  <string name="font_color_calendar_details">තොරතුරු ෆොන්ටයේ පාට</string>
+  <string name="calendar_lookahead_3hrs">පැය 3</string>
+  <string name="calendar_lookahead_6hrs">පැය 6</string>
+  <string name="calendar_lookahead_12hrs">පැය 12</string>
+  <string name="calendar_lookahead_today">අද</string>
+  <string name="calendar_lookahead_1day">1 දවසයි</string>
+  <string name="calendar_lookahead_3days">දවස් 3</string>
+  <string name="calendar_lookahead_1wk">1 සතියයි</string>
+  <string name="calendar_lookahead_2wks">සති 2</string>
+  <string name="calendar_lookahead_4wks">සති 4</string>
+  <string name="calendar_metadata_none">පෙන්වන්න එපා</string>
+  <string name="calendar_metadata_first_line">මුල් පේළිය පෙන්වන්න</string>
+  <string name="calendar_metadata_all">සියල්ල පෙන්වන්න</string>
+  <string name="white">සුදු</string>
+  <string name="grey">අළු</string>
+  <string name="black">කළු</string>
+  <string name="holo_blue_light">ලා නිල්</string>
+  <string name="holo_green_light">ලා කොළ</string>
+  <string name="holo_red_light">ලා රතු</string>
+  <string name="holo_blue_dark">තද නිල්</string>
+  <string name="holo_green_dark">තද කොළ</string>
+  <string name="holo_red_dark">තද රතු</string>
+  <string name="holo_purple">දම්</string>
+  <string name="holo_orange_light">ලා තැඹිලි</string>
+  <string name="holo_orange_dark">තද තැඹිලි</string>
+  <string name="holo_blue_bright">දීප්තිමත් නිල්</string>
+  <string name="weather_icon_set_title">අයිකන පොදිය</string>
+  <string name="weather_icons_standard">පැහැගැන්වූ</string>
+  <string name="weather_icons_monochrome">ඒකවර්ණ</string>
+  <string name="icon_set_selection_get_more">තව ලබාගන්න\u2026</string>
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5063cb2..4d08202 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -23,12 +23,12 @@
   <string name="weather_0">Торнадо</string>
   <string name="weather_1">Тропска олуја</string>
   <string name="weather_2">Ураган</string>
-  <string name="weather_3">Тешке олује</string>
+  <string name="weather_3">Јаке олује</string>
   <string name="weather_4">Олуја са грмљавином</string>
-  <string name="weather_5">Мешовито киша и снег</string>
-  <string name="weather_6">Мешовито киша и суснежица</string>
-  <string name="weather_7">Мешовито снег и суснежица</string>
-  <string name="weather_8">Густа киша која леди</string>
+  <string name="weather_5">Киша и снег</string>
+  <string name="weather_6">Киша и суснежица</string>
+  <string name="weather_7">Снег и суснежица</string>
+  <string name="weather_8">Ромињање ледене кише</string>
   <string name="weather_9">Ромињање кише</string>
   <string name="weather_10">Ледена киша</string>
   <string name="weather_11">Пљускови</string>
@@ -37,7 +37,7 @@
   <string name="weather_14">Лаки налети снега</string>
   <string name="weather_15">Вејавица снега</string>
   <string name="weather_16">Снег</string>
-  <string name="weather_17">Hail</string>
+  <string name="weather_17">Град</string>
   <string name="weather_18">Суснежица</string>
   <string name="weather_19">Прашина</string>
   <string name="weather_20">Магловито</string>
@@ -55,19 +55,19 @@
   <string name="weather_32">Сунчано</string>
   <string name="weather_33">Ведро</string>
   <string name="weather_34">Ведро</string>
-  <string name="weather_35">Мешовито киша и град</string>
+  <string name="weather_35">Киша и град</string>
   <string name="weather_36">Вруће</string>
-  <string name="weather_37">Местимичне олује</string>
-  <string name="weather_38">Расуте олује</string>
-  <string name="weather_39">Расуте олује</string>
-  <string name="weather_40">Расути пљускови</string>
+  <string name="weather_37">Локалне олује</string>
+  <string name="weather_38">Местимичне олује</string>
+  <string name="weather_39">Местимичне олује</string>
+  <string name="weather_40">Местимични пљускови</string>
   <string name="weather_41">Јак снег</string>
-  <string name="weather_42">Расуте снежне падавине</string>
+  <string name="weather_42">Местимичне снежне падавине</string>
   <string name="weather_43">Јак снег</string>
   <string name="weather_44">Претежно облачно</string>
   <string name="weather_45">Олујни пљускови</string>
   <string name="weather_46">Снежне падавине</string>
-  <string name="weather_47">Изоловане олујне кише</string>
+  <string name="weather_47">Локални олујни пљускови</string>
   <string name="weather_kph">км/ч</string>
   <string name="weather_mph">м/ч</string>
   <string name="weather_N">С</string>
@@ -79,7 +79,7 @@
   <string name="weather_W">З</string>
   <string name="weather_NW">СЗ</string>
   <string name="weather_no_data">Нема података</string>
-  <string name="weather_tap_to_refresh">Додирните да би сте освежили</string>
+  <string name="weather_tap_to_refresh">Додирни за освежавање</string>
   <string name="weather_refreshing">Освежавање</string>
   <string name="weather_last_sync_just_now">Управо сада</string>
   <string name="weather_cannot_reach_provider">Не може да се достигне %s тренутно</string>
@@ -95,8 +95,8 @@
   <string name="calendar_category">Догађаји у календару</string>
   <string name="general_category">Главно</string>
   <string name="display_category">Екран</string>
-  <string name="use_digital_clock_title">Користите дигитални сат</string>
-  <string name="use_digital_clock_summary">Изаберите да би сте пребацивали између дигиталног и аналогног сата</string>
+  <string name="use_digital_clock_title">Користи дигитални сат</string>
+  <string name="use_digital_clock_summary">Изабери да пребацујеш између дигиталног и аналогног сата</string>
   <string name="clock_font_title">Подебљани сати</string>
   <string name="clock_font_minutes_title">Подебљани минути</string>
   <string name="clock_font_date_title">Подебљани датум и аларм</string>
@@ -108,28 +108,28 @@
   <string name="weather_source_yahoo">Yahoo! Време</string>
   <string name="weather_use_custom_location">Користи прилагођену локацију</string>
   <string name="weather_geolocated">Лоцирање коришћењем мреже</string>
-  <string name="weather_custom_location_dialog_title">Унесите локацију</string>
+  <string name="weather_custom_location_dialog_title">Унеси локацију</string>
   <string name="weather_custom_location_hint">Град, Држава/Регион</string>
   <string name="weather_custom_location_title">Локација</string>
   <string name="weather_show_location_title">Прикажи локацију</string>
-  <string name="weather_show_timestamp_title">Прикажи печат времена</string>
+  <string name="weather_show_timestamp_title">Прикажи временску ознаку</string>
   <string name="weather_refresh_interval">Интервал освежавања</string>
   <string name="weather_use_metric">Користи метричне вредности</string>
   <string name="weather_retrieve_location_dialog_title">Не може да се преузме место!</string>
-  <string name="weather_retrieve_location_dialog_message">Мрежна геолокација је онемогућена.\n\n Поставите прилагођену локацију или омогућите мрежну локацију</string>
+  <string name="weather_retrieve_location_dialog_message">Мрежна геолокација је онемогућена.\n\n Постави прилагођену локацију или омогући мрежну локацију</string>
   <string name="weather_retrieve_location_dialog_enable_button">Омогућено</string>
   <string name="weather_invert_lowhigh">Прикажи најнижу/највишу температуру</string>
   <string name="weather_progress_title">Провера локације</string>
-  <string name="weather_alternate_icons_title">Користите иконе у боји</string>
-  <string name="weather_alternate_icons_summary">Изаберите да бисте се пребацивали између подразумеваних (у боји) и алтернативних (белих) икона</string>
+  <string name="weather_alternate_icons_title">Користи иконе у боји</string>
+  <string name="weather_alternate_icons_summary">Изабери да би пребацивао између подразумеваних (у боји) и алтернативних (белих) икона</string>
   <string name="weather_show_when_minimized_title">Прикажи док је умањено</string>
-  <string name="weather_show_when_minimized_summary">Приказ сажете информације о времену када је виџет умањен</string>
-  <string name="weather_select_location">Изаберите локацију</string>
+  <string name="weather_show_when_minimized_summary">Прикажи сажете информације о времену када је виџет умањен</string>
+  <string name="weather_select_location">Изабери локацију</string>
   <string name="calendar_title">Прикажи следећи догађај</string>
   <string name="calendars_title">Календар догађаја</string>
   <string name="calendars_summary">Пронађи догађаје из тих календара</string>
   <string name="calendar_reminders_only_title">Само подсетник</string>
-  <string name="calendar_reminders_only_summary">Покажи само догађаје са опоменама</string>
+  <string name="calendar_reminders_only_summary">Прикажи само догађаје са опоменама</string>
   <string name="calendar_hide_allday_title">Сакриј целодневне догађаје</string>
   <string name="calendar_icon_title">Икона календара</string>
   <string name="calendar_lookahead_title">Догађаји унапред</string>
@@ -137,11 +137,11 @@
   <string name="calendar_show_description_title">Опис догађаја</string>
   <string name="calendar_upcoming_events_category">Предстојећи догађаји</string>
   <string name="calendar_highlight_upcoming_events_title">Главни догађаји</string>
-  <string name="calendar_highlight_upcoming_events_summary">Истакните тренутне дневне догађаје и, након 8 сати увече, такође и догађаје наредног дана</string>
+  <string name="calendar_highlight_upcoming_events_summary">Истакни тренутне дневне догађаје и, након 8 сати увече, такође и догађаје наредног дана</string>
   <string name="calendar_highlight_upcoming_events_bold">Подебљани фонт</string>
   <string name="font_color">Боја фонта</string>
   <string name="font_color_alarm">Боја фонта аларма</string>
-  <string name="font_color_timestamp">Боја фонта печата времена</string>
+  <string name="font_color_timestamp">Боја фонта временске ознаке</string>
   <string name="font_color_calendar_details">Боја фонта детаља</string>
   <string name="calendar_lookahead_3hrs">3 сата</string>
   <string name="calendar_lookahead_6hrs">6 сати</string>
@@ -168,8 +168,8 @@
   <string name="holo_orange_light">Светло наранџаста</string>
   <string name="holo_orange_dark">Тамно наранџаста</string>
   <string name="holo_blue_bright">Светло плава</string>
-  <string name="weather_icon_set_title">Комплет икона</string>
+  <string name="weather_icon_set_title">Пакет икона</string>
   <string name="weather_icons_standard">Обојене</string>
   <string name="weather_icons_monochrome">Монохромне</string>
-  <string name="icon_set_selection_get_more">Набавите још\u2026</string>
+  <string name="icon_set_selection_get_more">Набави још\u2026</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ac2b791..9c7545f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -57,6 +57,7 @@
   <string name="weather_34">Skapligt</string>
   <string name="weather_35">Regn blandat med hagel</string>
   <string name="weather_36">Varmt</string>
+  <string name="weather_37">Enstaka åskbyar</string>
   <string name="weather_38">Spridda åskskurar</string>
   <string name="weather_39">Spridda åskskurar</string>
   <string name="weather_40">Spridda regnskurar</string>
@@ -64,7 +65,9 @@
   <string name="weather_42">Spridda snöbyar</string>
   <string name="weather_43">Krafigt snöfall</string>
   <string name="weather_44">Delvis mulet</string>
+  <string name="weather_45">Åskskurar</string>
   <string name="weather_46">Snöbyar</string>
+  <string name="weather_47">Enstaka åskskurar</string>
   <string name="weather_kph">km/h</string>
   <string name="weather_mph">mph</string>
   <string name="weather_N">N</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3bac91c..0a07089 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -102,7 +102,7 @@
   <string name="clock_font_date_title">日期與鬧鐘使用粗體</string>
   <string name="show_alarm_title">顯示下一個鬧鐘</string>
   <string name="clock_am_pm_title">顯示 AM/PM 指示器</string>
-  <string name="weather_enabled">啟用</string>
+  <string name="weather_enabled">已啟用</string>
   <string name="weather_enable">顯示天氣</string>
   <string name="weather_source_title">天氣來源</string>
   <string name="weather_source_yahoo">Yahoo! 氣象</string>
diff --git a/src/com/cyanogenmod/lockclock/ClockWidgetService.java b/src/com/cyanogenmod/lockclock/ClockWidgetService.java
index ea5da49..31a7837 100755
--- a/src/com/cyanogenmod/lockclock/ClockWidgetService.java
+++ b/src/com/cyanogenmod/lockclock/ClockWidgetService.java
@@ -120,7 +120,7 @@ public class ClockWidgetService extends IntentService {
                 int category = myOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, -1);
                 isKeyguard = category == AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD;
             }
-            if (D) Log.d("TAG", "For Widget id " + id + " isKeyguard is set to " + isKeyguard);
+            if (D) Log.d(TAG, "For Widget id " + id + " isKeyguard is set to " + isKeyguard);
 
             // Determine which layout to use
             boolean smallWidget = showWeather && showWeatherWhenMinimized
diff --git a/src/com/cyanogenmod/lockclock/weather/YahooWeatherProvider.java b/src/com/cyanogenmod/lockclock/weather/YahooWeatherProvider.java
index 5abe35d..7e4b66d 100644
--- a/src/com/cyanogenmod/lockclock/weather/YahooWeatherProvider.java
+++ b/src/com/cyanogenmod/lockclock/weather/YahooWeatherProvider.java
@@ -57,11 +57,15 @@ public class YahooWeatherProvider implements WeatherProvider {
                     "or placetype = 10 or placetype = 11 or placetype = 20) and text =");
     private static final String URL_PLACEFINDER =
             "http://query.yahooapis.com/v1/public/yql?format=json&q=" +
-            Uri.encode("select woeid, city from geo.placefinder where gflags=\"R\" and text =");
+            Uri.encode("select woeid, city, neighborhood, county from geo.placefinder where " +
+                    "gflags=\"R\" and text =");
 
     private static final String[] LOCALITY_NAMES = new String[] {
         "locality1", "locality2", "admin3", "admin2", "admin1"
     };
+    private static final String[] PLACE_NAMES = new String[] {
+        "city", "neigborhood", "county"
+    };
 
     private Context mContext;
 
@@ -219,15 +223,25 @@ public class YahooWeatherProvider implements WeatherProvider {
         try {
             JSONObject result = results.getJSONObject("Result");
             String woeid = result.getString("woeid");
-            String city = result.getString("city");
 
-            if (city == null) {
-                city = result.getString("neighborhood");
+            String city = null;
+            for (String name : PLACE_NAMES) {
+                if (!result.isNull(name)) {
+                    city = result.getString(name);
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log.v(TAG, String.format(Locale.US, "Placefinder for location %f %f " +
+                                "matched %s using %s", location.getLatitude(),
+                                location.getLongitude(), city, name));
+                    }
+                    break;
+                }
             }
 
             // The city name in the placefinder result is HTML encoded :-(
             if (city != null) {
                 city = Html.fromHtml(city).toString();
+            } else {
+                Log.w(TAG, "Can not resolve place name for " + location);
             }
 
             Log.d(TAG, "Resolved location " + location + " to " + city + " (" + woeid + ")");