LockClock: Remove ghost settings and Update strings to match CM11

Change-Id: If6f9c8623964c2900b0356c7c72b6da2b956b1ef

15 files changed, 50 insertions, 48 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2d44201..4396f28 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -166,4 +166,12 @@
     <string name="holo_orange_light">Ligte oranje</string>
     <string name="holo_orange_dark">Donker oranje</string>
     <string name="holo_blue_bright">Helder blou</string>
+    <string name="weather_kph">kph</string>
+    <string name="weather_mph">mph</string>
+    <string name="weather_icon_set_title">Ikoon stel</string>
+    <string name="weather_icons_standard">Gekleurde</string>
+    <string name="weather_icons_monochrome">Monochroom</string>
+    <string name="weather_icons_vclouds">VClouds</string>
+    <string name="icon_set_selection_get_more">Kry meer\u2026</string>
+    <string name="weather_source_openweathermap">OpenWeatherMap</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3bd04f9..8d693b8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -156,7 +156,6 @@
     <string name="calendar_highlight_upcoming_events_title">تسليط الضوء على الأحداث</string>
     <string name="calendar_highlight_upcoming_events_summary">تسليط الضوء على أحداث اليوم الحالي، وبعد 8:00، وأيضا الأحداث في اليوم التالي \' ق</string>
     <string name="calendar_highlight_upcoming_events_bold">خط عريض</string>
-    <string name="calendar_add_event_title">إضافة رمز الحدث</string>
 
     <!-- الطقس - الوان الخطوط -->
     <string name="font_color">لون الخط</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cbbaaa1..8724968 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -146,10 +146,6 @@
     <string name="calendar_highlight_upcoming_events_title">Zvýraznit události</string>
     <string name="calendar_highlight_upcoming_events_summary">Zvýraznit události aktuálního dne, a po 20. hodině také dalšího dne.</string>
     <string name="calendar_highlight_upcoming_events_bold">Tučné písmo</string>
-    <string name="calendar_add_event_title">Přidat ikonu události</string>
-    <string name="calendar_no_events">Žádné příští události</string>
-    <string name="calendar_no_events_summary">Přidat dotykem na +</string>
-    <string name="calendar_no_events_indicator_title">Zobrazovat \"Žádné události\"</string>
 
     <string name="font_color">Barva písma</string>
     <string name="font_color_alarm">Barva budíku</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 40e2adc..4848d28 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -105,7 +105,6 @@
     <string name="weather_enable">Εμφάνιση καιρού</string>
     <string name="weather_source_title">Πηγή καιρού</string>
     <string name="weather_source_yahoo">Καιρός Yahoo!</string>
-    <string name="weather_source_openweathermap">OpenWeatherMap</string>
     <string name="weather_use_custom_location">Χρήση προσαρμοσμένης τοποθεσίας</string>
     <string name="weather_geolocated">Εντοπισμός τοποθεσίας μέσω δικτύου</string>
     <string name="weather_custom_location_dialog_title">Εισάγετε τοποθεσία</string>
@@ -139,10 +138,6 @@
     <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="calendar_add_event_title">Προσθήκη συμβάντων</string>
-    <string name="calendar_no_events">Δεν έχουν προστεθεί συμβάντα</string>
-    <string name="calendar_no_events_summary">Πιέστε + για προσθήκη</string>
-    <string name="calendar_no_events_indicator_title">Εμφάνιση κειμένου \'Χωρίς συμβάντα\'</string>
     <string name="font_color">Χρώμα γραμματοσειράς</string>
     <string name="font_color_alarm">Χρώμα ξυπνητηριού</string>
     <string name="font_color_timestamp">Χρώμα ώρας</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7a4f98f..8cfd3d8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -68,7 +68,7 @@
     <string name="weather_46">Nieve</string>
     <string name="weather_47">Chap. aislados</string>
     <string name="weather_3200"></string> <!-- No disponible -->
-    <string name="weather_kph">kph</string>
+    <string name="weather_kph">km/h</string>
     <string name="weather_mph">mph</string>
     <string name="weather_N">N</string>
     <string name="weather_NE">NE</string>
@@ -106,6 +106,7 @@
     <string name="weather_enable">Mostrar clima</string>
     <string name="weather_source_title">Servicio de clima</string>
     <string name="weather_source_yahoo">Yahoo! El Tiempo</string>
+    <string name="weather_source_openweathermap">OpenWeatherMap</string>
     <string name="weather_use_custom_location">Usar ubicación personalizada</string>
     <string name="weather_geolocated">Geolocalización por red</string>
     <string name="weather_custom_location_dialog_title">Introducir ubicación</string>
@@ -124,13 +125,13 @@
     <string name="weather_alternate_icons_summary">Usar iconos en color en vez de los predeterminados en blanco</string>
     <string name="weather_show_when_minimized_title">Mostrar al minimizar</string>
     <string name="weather_show_when_minimized_summary">Mostrar la información climática cuando el widget esté minimizado</string>
-    <string name="weather_select_location">Selecciona ubicación</string>
+    <string name="weather_select_location">Seleccionar ubicación</string>
     <string name="calendar_title">Mostrar próximo evento</string>
     <string name="calendars_title">Calendario de eventos</string>
     <string name="calendars_summary">Buscar eventos en los calendarios</string>
     <string name="calendar_reminders_only_title">Solo recordatorios</string>
     <string name="calendar_reminders_only_summary">Mostrar solo eventos con recordatorios</string>
-    <string name="calendar_hide_allday_title">Ocultar eventos \u00ABtodo el día\u00BB</string>
+    <string name="calendar_hide_allday_title">Ocultar eventos \u00ABTodo el día\u00BB</string>
     <string name="calendar_icon_title">Mostrar icono Calendario</string>
     <string name="calendar_lookahead_title">Eventos futuros</string>
     <string name="calendar_show_location_title">Lugar del evento</string>
@@ -171,6 +172,6 @@
     <string name="weather_icon_set_title">Conjunto de iconos</string>
     <string name="weather_icons_standard">Coloreado</string>
     <string name="weather_icons_monochrome">Monocromo</string>
+    <string name="weather_icons_vclouds">VClouds</string>
     <string name="icon_set_selection_get_more">Conseguir más\u2026</string>
-
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c17a1b0..1d7898d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -187,7 +187,6 @@
     <string name="weather_icon_set_title">Définir les icônes</string>
     <string name="weather_icons_standard">Coloré</string>
     <string name="weather_icons_monochrome">Monochrome</string>
-    <string name="weather_icons_modern">Moderne</string>
     <string name="icon_set_selection_get_more">Plus\u2026</string>
 
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 549b92c..79fdb8c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -127,6 +127,7 @@
     <string name="weather_enable">Időjárás megjelenítése</string>
     <string name="weather_source_title">Időjárás forrása</string>
     <string name="weather_source_yahoo">Yahoo! Időjárás</string>
+    <string name="weather_source_openweathermap">OpenWeatherMap</string>
     <string name="weather_use_custom_location">Egyéni hely használata</string>
     <string name="weather_geolocated">Helyzetmeghatározás</string>
     <string name="weather_custom_location_dialog_title">Hely megadása</string>
@@ -200,5 +201,10 @@
     <string name="holo_orange_dark">Sötét narancs</string>
     <string name="holo_blue_bright">Sötétkék</string>
 
-
+    <!-- Weather icon sets -->
+    <string name="weather_icon_set_title">Ikon beállítások</string>
+    <string name="weather_icons_standard">Színes</string>
+    <string name="weather_icons_monochrome">Fekete-fehér</string>
+    <string name="weather_icons_vclouds">VClouds</string>
+    <string name="icon_set_selection_get_more">Továbbiak beszerzése\u2026</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 740875a..a818ff2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -82,7 +82,7 @@
     <string name="weather_tap_to_refresh">Tocca per aggiornare</string>
     <string name="weather_refreshing">Aggiornamento\u2026</string>
     <string name="weather_last_sync_just_now">Poco fa</string>
-    <string name="weather_cannot_reach_provider">Impossibile collegarsi a %s</string>
+    <string name="weather_cannot_reach_provider">Impossibile collegarsi a %s al momento</string>
     <string name="weather_refresh_manual">Manuale</string>
     <string name="weather_refresh_30min">30 minuti</string>
     <string name="weather_refresh_60min">60 minuti</string>
@@ -106,6 +106,7 @@
     <string name="weather_enable">Visualizza meteo</string>
     <string name="weather_source_title">Fonte meteo</string>
     <string name="weather_source_yahoo">Yahoo! Meteo</string>
+    <string name="weather_source_openweathermap">OpenWeatherMap</string>
     <string name="weather_use_custom_location">Posizione personalizzata</string>
     <string name="weather_geolocated">Localizzazione tramite la rete</string>
     <string name="weather_custom_location_dialog_title">Inserisci la posizione</string>
@@ -172,7 +173,7 @@
     <string name="weather_icon_set_title">Set icone</string>
     <string name="weather_icons_standard">Colorate</string>
     <string name="weather_icons_monochrome">Monocrome</string>
-    <string name="weather_icons_modern">Moderne</string>
+    <string name="weather_icons_vclouds">VClouds</string>
     <string name="icon_set_selection_get_more">Altre\u2026</string>
 
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7ade094..63a2138 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -67,6 +67,8 @@
     <string name="weather_46">Sniego pūgos</string>
     <string name="weather_47">Izoliuotos liūtys su perkūnija</string>
     <string name="weather_3200"></string>
+    <string name="weather_kph">km/val.</string>
+    <string name="weather_mph">ml/val.</string>
     <string name="weather_N">Š</string>
     <string name="weather_NE">ŠR</string>
     <string name="weather_E">R</string>
@@ -101,7 +103,9 @@
     <string name="clock_am_pm_title">Rodyti AM/PM indikatorių</string>
     <string name="weather_enabled">Įjungta</string>
     <string name="weather_enable">Rodyti orus</string>
-    <string name="weather_source_yahoo">Yahoo! Weather</string>
+    <string name="weather_source_title">Orų šaltinis</string>
+    <string name="weather_source_yahoo">Yahoo! Orai</string>
+    <string name="weather_source_openweathermap">Atviras orų žemėlapis</string>
     <string name="weather_use_custom_location">Naudoti savitą vietovę</string>
     <string name="weather_geolocated">Nustatyta naudojant tinklą</string>
     <string name="weather_custom_location_dialog_title">Įveskite vietovę</string>
@@ -164,4 +168,9 @@
     <string name="holo_orange_light">Šviesi oranžinė</string>
     <string name="holo_orange_dark">Tamsi oranžinė</string>
     <string name="holo_blue_bright">Šviesiai mėlyna</string>
+    <string name="weather_icon_set_title">Piktogramų rinkinys</string>
+    <string name="weather_icons_standard">Spalvotas</string>
+    <string name="weather_icons_monochrome">Monochromas</string>
+    <string name="weather_icons_vclouds">VClouds</string>
+    <string name="icon_set_selection_get_more">Gauti daugiau\u2026</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index f2865b0..0c9a966 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -165,4 +165,13 @@
     <string name="clock_am_pm_title">Exibir indicador AM/PM</string>
     <string name="weather_select_location">Selecionar localização</string>
     <string name="weather_cannot_reach_provider">Não foi possível alcançar %s</string>
-</resources>
+    <string name="weather_source_title">Fonte de dados</string>
+    <string name="weather_source_openweathermap">OpenWeatherMap</string>
+    <string name="weather_icon_set_title">Ícones</string>
+    <string name="weather_icons_standard">Colorido</string>
+    <string name="weather_icons_monochrome">Monocromático</string>
+    <string name="weather_icons_vclouds">VNuvens</string>
+    <string name="icon_set_selection_get_more">Obtenha mais\u2026</string>
+    <string name="weather_kph">km/h</string>
+    <string name="weather_mph">mph</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4c1b0e7..694337e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -70,7 +70,6 @@
     <string name="weather_47">Местами грозы</string>
     <string name="weather_3200"></string>
 
-    <!-- Weather - Speed units -->
     <string name="weather_kph">км/ч</string>
     <string name="weather_mph">миль/ч</string>
 
@@ -113,7 +112,6 @@
     <string name="weather_enabled">Включено</string>
     <string name="weather_enable">Погода отображается</string>
     <string name="weather_source_title">Сервер погоды</string>
-    <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>
@@ -182,10 +180,9 @@
     <string name="holo_orange_dark">Тёмно-оранжевый</string>
     <string name="holo_blue_bright">Ярко-синий</string>
 
-     <!-- Weather icon sets -->
-     <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">Скачать ещё</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">Скачать ещё</string>
 
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 67c206f..b657f8d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -158,7 +158,6 @@
     <string name="calendar_highlight_upcoming_events_title">Izpostavi dogodke</string>
     <string name="calendar_highlight_upcoming_events_summary">Izpostavi današnji dan\'s dogodke in, po 20 uri, tudi naslednji dan\'s dogodki</string>
     <string name="calendar_highlight_upcoming_events_bold">Poudarjena pisava</string>
-    <string name="calendar_add_event_title">Dodaj ikono dogodka</string>
 
     <!-- Preferences - Font colors -->
     <string name="font_color">Barva pisave</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 77c04d5..5ac83ac 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -157,7 +157,6 @@
     <string name="calendar_highlight_upcoming_events_title">Etkinlikleri vurgula</string>
     <string name="calendar_highlight_upcoming_events_summary">Günlük etkinlikleri ve saat 8\'den itibaren yarınki etkinlikleri vurgula</string>
     <string name="calendar_highlight_upcoming_events_bold">Kalın yazı</string>
-    <string name="calendar_add_event_title">Etkinlik simgesi ekle</string>
 
     <!-- Preferences - Font colors -->
     <string name="font_color">Yazı rengi</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 753cc01..a182e40 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -98,12 +98,12 @@
     <string name="weather_W">W</string>
     <string name="weather_NW">NW</string>
 
-    <!-- Weather - error messages -->
+    <!-- Weather - Error messages -->
     <string name="weather_no_data">No data</string>
     <string name="weather_tap_to_refresh">Tap to refresh</string>
     <string name="weather_refreshing">Refreshing</string>
     <string name="weather_last_sync_just_now">Just now</string>
-    <string name="weather_cannot_reach_provider">Can\'t reach %s</string>
+    <string name="weather_cannot_reach_provider">Can\'t reach %s at the moment</string>
 
     <!-- Weather - Update frequency -->
     <string name="weather_refresh_manual">Manual</string>
@@ -173,10 +173,6 @@
     <string name="calendar_highlight_upcoming_events_title">Highlight events</string>
     <string name="calendar_highlight_upcoming_events_summary">Highlight the current day\'s events and, after 8pm, also the next day\'s events</string>
     <string name="calendar_highlight_upcoming_events_bold">Bold font</string>
-    <string name="calendar_add_event_title">Add Event icon</string>
-    <string name="calendar_no_events">No events in lookahead window</string>
-    <string name="calendar_no_events_summary">Tap + to add</string>
-    <string name="calendar_no_events_indicator_title">Show \'No events\' text</string>
 
     <!-- Preferences - Font colors -->
     <string name="font_color">Font color</string>
@@ -184,7 +180,7 @@
     <string name="font_color_timestamp">Timestamp font color</string>
     <string name="font_color_calendar_details">Details font color</string>
 
-    <!-- Calendar - lookahead -->
+    <!-- Calendar - Lookahead -->
     <string name="calendar_lookahead_3hrs">3 hours</string>
     <string name="calendar_lookahead_6hrs">6 hours</string>
     <string name="calendar_lookahead_12hrs">12 hours</string>
diff --git a/res/xml/preferences_calendar.xml b/res/xml/preferences_calendar.xml
index c3310cb..f6b5f87 100755
--- a/res/xml/preferences_calendar.xml
+++ b/res/xml/preferences_calendar.xml
@@ -67,18 +67,6 @@
             android:title="@string/calendar_icon_title"
             android:defaultValue="true" />
 
-        <CheckBoxPreference
-            android:key="calendar_add_event_icon"
-            android:dependency="show_calendar"
-            android:title="@string/calendar_add_event_title"
-            android:defaultValue="true" />
-
-        <CheckBoxPreference
-            android:key="calendar_no_events_text"
-            android:dependency="show_calendar"
-            android:title="@string/calendar_no_events_indicator_title"
-            android:defaultValue="true" />
-
         <ListPreference
             android:key="calendar_show_location"
             android:dependency="show_calendar"