Reconcile with jb-mr1-release - do not merge
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index b2d9c86..9d30f7c 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="reminder_methods_labels">
- <item msgid="5172236776878811487">"Notificac."</item>
+ <item msgid="5172236776878811487">"Notificació"</item>
<item msgid="1751151680520784746">"Correu electrònic"</item>
<item msgid="2658001219380695677">"SMS"</item>
<item msgid="7926918288165444873">"Alarma"</item>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 5b34679..2ad1f8f 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -101,7 +101,7 @@
<item msgid="4921622452710220193">"Brüssel"</item>
<item msgid="727296339287965963">"Sarajevo"</item>
<item msgid="5997630882187580225">"Windhoek"</item>
- <item msgid="3828800493609994208">"W. Africa Time"</item>
+ <item msgid="3828800493609994208">"West Africa Time"</item>
<item msgid="7527935722014187591">"Amman, Jordanien"</item>
<item msgid="672509109295227133">"Athen, Istanbul"</item>
<item msgid="1835470340349221646">"Beirut, Libanon"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9b6f6b9..1addcd8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -113,8 +113,8 @@
<string name="quick_response_dialog_title" msgid="2681309456412199207">"Kurzantwort auswählen"</string>
<string name="quick_response_email_failed" msgid="5544066405231853245">"Das E-Mail-Programm konnte nicht gefunden werden."</string>
<string-array name="quick_response_defaults">
- <item msgid="1524421198348168403">"Hat einige Minuten Verspätung"</item>
- <item msgid="6215158751728689832">"Startet in etwa 10 Minuten"</item>
+ <item msgid="1524421198348168403">"Bin einige Minuten verspätet"</item>
+ <item msgid="6215158751728689832">"Bin in etwa 10 Minuten da"</item>
<item msgid="4485794001743679338">"Soll ohne mich anfangen"</item>
<item msgid="8036557974294987511">"Ich schaffe es leider nicht. Wir müssen einen neuen Termin ausmachen."</item>
</string-array>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 51cd5d5..d56dd60 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -145,7 +145,7 @@
<string name="yearly_plain" msgid="3652692085322162449">"Varje år"</string>
<string name="monthly_on_day" msgid="5370155265278821156">"Varje månad (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
<string name="yearly" msgid="8576208380302949002">"Varje år (den <xliff:g id="DATES">%s</xliff:g>)"</string>
- <string name="custom" product="tablet" msgid="3806817351377723249">"Anpassad (går ej att anpassa på pekdatorn)"</string>
+ <string name="custom" product="tablet" msgid="3806817351377723249">"Anpassad (går ej att anpassa på surfplattan)"</string>
<string name="custom" product="default" msgid="4137468716966004993">"Anpassad (går ej att anpassa i mobilen)"</string>
<string name="modify_event" msgid="5982876409997142690">"Ändra bara den här händelsen"</string>
<string name="modify_all" msgid="4421657265864209041">"Ändra alla händelser i serien"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 19fe5b2..928de56 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -145,8 +145,8 @@
<string name="yearly_plain" msgid="3652692085322162449">"Kila mwaka"</string>
<string name="monthly_on_day" msgid="5370155265278821156">"Kila mwezi (kwa siku ya <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
<string name="yearly" msgid="8576208380302949002">"Kila mwaka (mnamo <xliff:g id="DATES">%s</xliff:g>)"</string>
- <string name="custom" product="tablet" msgid="3806817351377723249">"Kaida (haiwezi kugeuzia kwa kompyuta ndogo)"</string>
- <string name="custom" product="default" msgid="4137468716966004993">"Kaida (haiwezi kugeuzia kwa simu)"</string>
+ <string name="custom" product="tablet" msgid="3806817351377723249">"Maalum (haiwezi kugeuzia kukufaa kwenye kompyuta kibao)"</string>
+ <string name="custom" product="default" msgid="4137468716966004993">"Maalum (haiwezi kugeuzia kukufaa kwenye simu)"</string>
<string name="modify_event" msgid="5982876409997142690">"Badilisha tukio hili pekee"</string>
<string name="modify_all" msgid="4421657265864209041">"Badilisha matukio yote katika mfululizo"</string>
<string name="modify_all_following" msgid="3017428541066390380">"Badilisha hili na matukio yote yajayo"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 384df73..619e962 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -59,7 +59,7 @@
<string name="event_edit" msgid="4006961928830064662">"Редаг. подію"</string>
<string name="event_delete" msgid="2386667193277770442">"Видалити подію"</string>
<string name="goto_today" msgid="9162136434410891230">"Сьогодні"</string>
- <string name="menu_preferences" msgid="9120238479503233925">"Налаштув-ня"</string>
+ <string name="menu_preferences" msgid="9120238479503233925">"Налаштування"</string>
<string name="menu_select_visible_calendars" msgid="735670432781741817">"Календарі"</string>
<string name="search" msgid="550656004486017426">"Пошук"</string>
<string name="hide_controls" msgid="830320505938520882">"Сховати елем. керув."</string>
@@ -72,7 +72,7 @@
<string name="select_synced_calendars_title" msgid="7916084873075901448">"Календарі для синхронізації"</string>
<string name="select_synced_calendars_button" msgid="8890542984949996251">"Календарі для синхронізації"</string>
<string name="hint_what" msgid="709155115005044531">"Назва події"</string>
- <string name="hint_where" msgid="4972598001033801974">"Місцезнаходж-ня"</string>
+ <string name="hint_where" msgid="4972598001033801974">"Місце проведення"</string>
<string name="hint_description" msgid="1910143586169033232">"Опис"</string>
<string name="hint_attendees" msgid="1650488163176888480">"Гості"</string>
<string name="creating_event" msgid="7516249252554059980">"Подію створено."</string>
@@ -157,7 +157,7 @@
<string name="change_response_title" msgid="7704714776070974984">"Змінити відповідь"</string>
<string name="menu_general_preferences" msgid="2812705323334260708">"Загальні налаштування"</string>
<string name="menu_about_preferences" msgid="6124375438237674973">"Про Календар"</string>
- <string name="preferences_title" msgid="8045855493262131773">"Налаштув-ня"</string>
+ <string name="preferences_title" msgid="8045855493262131773">"Налаштування"</string>
<string name="preferences_general_title" msgid="2069075513760573117">"Налаш. перегляду календ."</string>
<string name="preferences_reminder_title" msgid="6940022527071973010">"Налашт-ня нагадувань"</string>
<string name="preferences_hide_declined_title" msgid="1849295943669890034">"Сховати відхилені події"</string>
