Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0

9 files changed, 91 insertions, 7 deletions

diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index f0a07e1d..67e2a0cd 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -24,4 +24,15 @@
   <string name="preferences_default_snooze_delay_dialog">التأخير انتظار الافتراضي</string>
   <string name="default_start_title">المشهد الافتراضي</string>
   <string name="default_start_last">تستخدم طريقة العرض سابقا</string>
+  <string name="events_delete">حذف الأحداث</string>
+  <string name="action_select_all">تحديد الكل</string>
+  <string name="action_select_none">إلغاء تحديد الكل</string>
+  <string name="action_delete">تم</string>
+  <string name="all_events">جميع الأحداث</string>
+  <string name="no_events">لا يوجد أحداث متاحة</string>
+  <string name="evt_del_dlg_title">حذف الأحداث؟</string>
+  <string name="evt_del_dlg_msg_selected">سيتم حذف الأحداث المحددة</string>
+  <string name="evt_del_dlg_msg_all">سيتم حذف كافة الأحداث</string>
+  <string name="no_events_selected">لا يوجد أحداث محددة</string>
+  <string name="go_to">"اذهب إلى"</string>
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 629693cc..39b76553 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -17,4 +17,22 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="preferences_alerts_custom_snooze_delay_title">Erënnerung fir d\'Widderhuelungszäit</string>
+  <string name="preferences_alerts_custom_snooze_delay_summary_on">Ëmmer nofroe wéi laang bis déi nächst Erënnerung soll gewaart ginn</string>
+  <string name="preferences_alerts_custom_snooze_delay_summary_off">Ëmmer no der Standardzäit erënneren</string>
+  <string name="snooze_delay_dialog_title">Erënneren an\u2026</string>
+  <string name="preferences_default_snooze_delay_title">Standard-Widderhuelungszäit</string>
+  <string name="preferences_default_snooze_delay_dialog">Erënnerung widderhuelen no\u2026</string>
+  <string name="default_start_title">Standard-Usiicht</string>
+  <string name="default_start_last">Lescht benotzten Usiicht</string>
+  <string name="events_delete">Rendezvouse läschen</string>
+  <string name="action_select_all">All auswielen</string>
+  <string name="action_select_none">Auswiel ophiewen</string>
+  <string name="action_delete">Fäerdeg</string>
+  <string name="all_events">All Rendezvousen</string>
+  <string name="no_events">Keng Rendezvousen disponibel</string>
+  <string name="evt_del_dlg_title">Rendezvouse läschen?</string>
+  <string name="evt_del_dlg_msg_selected">Déi ausgewielte Rendezvouse gi geläscht</string>
+  <string name="evt_del_dlg_msg_all">All d\'Rendezvouse gi geläscht</string>
+  <string name="no_events_selected">Keng Rendezvousen ausgewielt</string>
+  <string name="go_to">"Wiesselen op"</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index e0969eea..6872256f 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -40,6 +40,10 @@
     <item quantity="one">1 Stonn</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> Stonnen</item>
   </plurals>
+  <plurals name="Ndays">
+    <item quantity="one">1 Dag</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> Deeg</item>
+  </plurals>
   <plurals name="weekN">
     <item quantity="one">WOCH <xliff:g id="count">%d</xliff:g></item>
     <item quantity="other">WOCH <xliff:g id="count">%d</xliff:g></item>
@@ -180,7 +184,6 @@
   <string name="preferences_hide_declined_title">Ofgeleent Rendezvouse verstoppen</string>
   <string name="preferences_week_start_day_title">D\'Woch fänkt un</string>
   <string name="preferences_week_start_day_dialog">D\'Woch fänkt un</string>
-  <string name="preferences_week_start_day_default">-1</string>
   <string name="preferences_clear_search_history_title">Sichhistorique läschen</string>
   <string name="preferences_clear_search_history_summary">D\'Sich déi gemaach goufe läschen</string>
   <string name="search_history_cleared">De Sichhistorique gouf geläscht.</string>
@@ -190,11 +193,9 @@
   <string name="preferences_alerts_popup_title">Pop-up-Notifikatioun</string>
   <string name="preferences_default_reminder_title">Standardzäit fir Erënnerungen</string>
   <string name="preferences_default_reminder_dialog">Standardzäit fir Erënnerungen</string>
-  <string name="preferences_default_reminder_default">10</string>
   <string name="preferences_use_home_tz_title">Heemechtszäitzon benotzen</string>
   <string name="preferences_use_home_tz_descrip">Weist beim Reesen d\'Kalenner- a Rendezvouszäiten an der Heemechtszäitzon</string>
   <string name="preferences_home_tz_title">Heemechtszäitzon</string>
-  <string name="preferences_home_tz_default">Europe/Luxembourg</string>
   <string name="preferences_show_week_num_title">Wochennummer uweisen</string>
   <string name="preferences_about_title">Iwwer</string>
   <string name="preferences_build_version">Buildversioun</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 09aa3d5f..000389bf 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -24,4 +24,15 @@
   <string name="preferences_default_snooze_delay_dialog">Întârzierea snooze implicită</string>
   <string name="default_start_title">Vizualizare implicită</string>
   <string name="default_start_last">Vizualizarea folosită anterior</string>
+  <string name="events_delete">Ștergeți evenimentele</string>
+  <string name="action_select_all">Selectare totală</string>
+  <string name="action_select_none">Deselectați toate</string>
+  <string name="action_delete">Realizat</string>
+  <string name="all_events">Toate evenimentele</string>
+  <string name="no_events">Nu sunt evenimente disponibile</string>
+  <string name="evt_del_dlg_title">Ștergeți evenimentele?</string>
+  <string name="evt_del_dlg_msg_selected">Evenimente selectate vor fi șterse</string>
+  <string name="evt_del_dlg_msg_all">Toate evenimentele vor fi șterse</string>
+  <string name="no_events_selected">Nu sunt evenimente selectate</string>
+  <string name="go_to">"Du-te la"</string>
 </resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index 7e7bea8e..7c306295 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -22,15 +22,15 @@
   <string name="snooze_delay_dialog_title">මදකට නිදන ප්‍රමාදය සකසන්න</string>
   <string name="preferences_default_snooze_delay_title">පෙරනිමි මදකට නිදන ප්‍රමාදය</string>
   <string name="preferences_default_snooze_delay_dialog">පෙරනිමි මදකට නිදන ප්‍රමාදය</string>
-  <string name="default_start_title">පෙරනිමි පෙනුම</string>
-  <string name="default_start_last">කලින් භාවිතාවූ පෙනුම</string>
+  <string name="default_start_title">පෙරනිමි දසුන</string>
+  <string name="default_start_last">පෙර භාවිතා වූ දසුන</string>
   <string name="events_delete">සිදුවීම් මකන්න</string>
   <string name="action_select_all">සියල්ල තෝරන්න</string>
   <string name="action_select_none">සියල්ල නොතෝරන්න</string>
-  <string name="action_delete">හරි</string>
+  <string name="action_delete">නිමයි</string>
   <string name="all_events">සියලු සිදුවීම්</string>
   <string name="no_events">සිදුවීම් කිසිවක් නොමැත</string>
-  <string name="evt_del_dlg_title">සිදුවීම් මකන්නද?</string>
+  <string name="evt_del_dlg_title">සිදුවීම් මකනවා ද?</string>
   <string name="evt_del_dlg_msg_selected">තෝරා ඇති සිදුවීම් මකාදැමෙනු ඇත</string>
   <string name="evt_del_dlg_msg_all">සියලු සිදුවීම් මකාදැමෙනු ඇත</string>
   <string name="no_events_selected">සිදුවීමක් තෝරා නොමැත</string>
diff --git a/res/values-sk/cm_plurals.xml b/res/values-sk/cm_plurals.xml
new file mode 100644
index 00000000..ee5da426
--- /dev/null
+++ b/res/values-sk/cm_plurals.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     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">
+  <plurals name="events_selected">
+    <item quantity="one">%1$d vybraná</item>
+    <item quantity="few">%1$d vybrané</item>
+    <item quantity="other">%1$d vybraných</item>
+  </plurals>
+</resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 87d94056..8b0a012c 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -24,5 +24,15 @@
   <string name="preferences_default_snooze_delay_dialog">Standardsnoozelängd</string>
   <string name="default_start_title">Standardvisning</string>
   <string name="default_start_last">Tidigare använd visning</string>
+  <string name="events_delete">Ta bort händelser</string>
   <string name="action_select_all">Välj alla</string>
+  <string name="action_select_none">Avmarkera alla</string>
+  <string name="action_delete">Färdig</string>
+  <string name="all_events">Alla händelser</string>
+  <string name="no_events">Inga händelser tillgängliga</string>
+  <string name="evt_del_dlg_title">Ta bort händelser?</string>
+  <string name="evt_del_dlg_msg_selected">Valda händelser kommer tas bort</string>
+  <string name="evt_del_dlg_msg_all">Alla händelser kommer tas bort</string>
+  <string name="no_events_selected">Inga händelser valda</string>
+  <string name="go_to">"Gå till"</string>
 </resources>
diff --git a/res/values-tr/cm_plurals.xml b/res/values-tr/cm_plurals.xml
index b507bb2f..3fcbbed5 100644
--- a/res/values-tr/cm_plurals.xml
+++ b/res/values-tr/cm_plurals.xml
@@ -17,6 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="events_selected">
+    <item quantity="one">%1$d seçildi</item>
     <item quantity="other">%1$d seçildi</item>
   </plurals>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index aa4ef6db..63474aed 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -20,10 +20,18 @@
   <string name="preferences_alerts_custom_snooze_delay_summary_on">每當重響提醒時要求重響延遲</string>
   <string name="preferences_alerts_custom_snooze_delay_summary_off">總是使用預設重響延遲</string>
   <string name="snooze_delay_dialog_title">設定重響延遲</string>
+  <string name="preferences_default_snooze_delay_title">預設重響延遲時間</string>
+  <string name="preferences_default_snooze_delay_dialog">預設重響延遲</string>
+  <string name="default_start_title">預設視圖</string>
   <string name="events_delete">刪除活動</string>
   <string name="action_select_all">全選</string>
   <string name="action_select_none">取消全選</string>
   <string name="action_delete">完成</string>
   <string name="all_events">所有活動</string>
+  <string name="no_events">沒有可用活動</string>
   <string name="evt_del_dlg_title">刪除活動嗎？</string>
+  <string name="evt_del_dlg_msg_selected">將刪除所選活動</string>
+  <string name="evt_del_dlg_msg_all">將刪除所有活動</string>
+  <string name="no_events_selected">沒有已選擇的活動</string>
+  <string name="go_to">"前往"</string>
 </resources>