merge in ics-mr1-release history after reset to ics-mr1
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index da1fc58..95cbfaa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -86,7 +86,7 @@
<string name="description_label" msgid="7193475046717505855">"Beschreibung"</string>
<string name="presence_label" msgid="6169724148441175862">"Mich anzeigen als"</string>
<string name="privacy_label" msgid="9215031965259597335">"Datenschutz"</string>
- <string name="reminders_label" msgid="7292389181815525676">"Erinnerung hinzu"</string>
+ <string name="reminders_label" msgid="7292389181815525676">"Erinnerung hinzufügen"</string>
<string name="no_syncable_calendars" msgid="7019488867045436129">"Keine Kalender"</string>
<string name="no_calendars_found" msgid="8968682716053492187">"Damit Sie einen Termin hinzufügen können, müssen Sie mindestens ein Google Kalender-Konto zu Ihrem Gerät hinzufügen und einen Kalender sichtbar machen. Tippen Sie zum Hinzufügen eines Kontos auf \"Konto hinzufügen\". Falls Sie gerade ein Konto hinzugefügt haben, warten Sie, bis die Synchronisierung abgeschlossen ist, und versuchen Sie es dann erneut. Sie können auch auf \"Abbrechen\" tippen und sich vergewissern, dass mindestens ein Kalender sichtbar ist."</string>
<string name="create_an_account_desc" msgid="7249605109240576895">"Google Kalender funktioniert besser mit einem Google-Konto."\n\n"• Zugriff über jeden beliebigen Browser"\n"• Sichern von Terminen mit Schutzfunktion"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 7bc7064..10b9751 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="reminder_methods_labels">
<item msgid="5172236776878811487">"Notif."</item>
- <item msgid="1751151680520784746">"Correo electrónico"</item>
+ <item msgid="1751151680520784746">"Correo"</item>
<item msgid="2658001219380695677">"SMS"</item>
</string-array>
<string-array name="reminder_minutes_labels">
@@ -189,6 +189,6 @@
<item msgid="5917946202321434335">"Día"</item>
<item msgid="6248480754959562740">"Semana"</item>
<item msgid="4298472806133153766">"Mes"</item>
- <item msgid="5033084974413793845">"Contenidos"</item>
+ <item msgid="5033084974413793845">"Agenda"</item>
</string-array>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c438488..f033ae3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -55,7 +55,7 @@
<string name="event_delete" msgid="2386667193277770442">"Eliminar evento"</string>
<string name="goto_today" msgid="9162136434410891230">"Hoy"</string>
<string name="menu_preferences" msgid="9120238479503233925">"Configuración"</string>
- <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calend most"</string>
+ <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendarios"</string>
<string name="search" msgid="550656004486017426">"Buscar"</string>
<string name="hide_controls" msgid="830320505938520882">"Ocultar los controles"</string>
<string name="show_controls" msgid="715520586028062621">"Mostrar los controles"</string>
@@ -64,8 +64,8 @@
<string name="not_synced" msgid="4275114941801829419">"no sincronizada"</string>
<string name="acct_not_synced" msgid="6126800985681230627">"Puede que tus calendarios no estén actualizados ya que la sincronización de esta cuenta no se está realizando."</string>
<string name="accounts" msgid="849401841083180306">"Cuentas y sincronización"</string>
- <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendarios para sincronizar"</string>
- <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendarios para sincronizar"</string>
+ <string name="select_synced_calendars_title" msgid="7916084873075901448">"Sincronización de calendarios"</string>
+ <string name="select_synced_calendars_button" msgid="8890542984949996251">"Sincronización de calendarios"</string>
<string name="hint_what" msgid="709155115005044531">"Nombre del evento"</string>
<string name="hint_where" msgid="4972598001033801974">"Ubicación"</string>
<string name="hint_description" msgid="1910143586169033232">"Descripción"</string>
@@ -117,13 +117,13 @@
<string name="dismiss_all_label" msgid="1834400025868091301">"Descartar todos"</string>
<string name="does_not_repeat" msgid="1877681921029738999">"Evento único"</string>
<string name="daily" msgid="560350706808680448">"Diariamente"</string>
- <string name="every_weekday" msgid="5896574838353902978">"Los días de semana (lun. a vie.)"</string>
- <string name="weekly" msgid="2006107373119027114">"Semanalmente (cada <xliff:g id="DAYS_OF_WEEK">%s</xliff:g>)"</string>
- <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensual (cada <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
+ <string name="every_weekday" msgid="5896574838353902978">"Semanalmente (lun. a vie.)"</string>
+ <string name="weekly" msgid="2006107373119027114">"Semanalmente (todos los <xliff:g id="DAYS_OF_WEEK">%s</xliff:g>)"</string>
+ <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensualmente (el <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
<string name="monthly" msgid="4587116285383048586">"Mensual"</string>
<string name="yearly_plain" msgid="3652692085322162449">"Anual"</string>
- <string name="monthly_on_day" msgid="5370155265278821156">"Mensual (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
- <string name="yearly" msgid="8576208380302949002">"Anual (el <xliff:g id="DATES">%s</xliff:g>)"</string>
+ <string name="monthly_on_day" msgid="5370155265278821156">"Mensualmente (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
+ <string name="yearly" msgid="8576208380302949002">"Anualmente (el <xliff:g id="DATES">%s</xliff:g>)"</string>
<string name="custom" product="tablet" msgid="3806817351377723249">"Personalizado (no se puede personalizar en la tableta)"</string>
<string name="custom" product="default" msgid="4137468716966004993">"Personalizado (no se puede personalizar en el teléfono)"</string>
<string name="modify_event" msgid="5982876409997142690">"Cambiar solo este evento"</string>
@@ -138,12 +138,12 @@
<string name="preferences_title" msgid="8045855493262131773">"Configuración"</string>
<string name="preferences_general_title" msgid="2069075513760573117">"Configuración de vista de calendario"</string>
<string name="preferences_reminder_title" msgid="6940022527071973010">"Configuración de recordatorio"</string>
- <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar eventos rechaz."</string>
- <string name="preferences_week_start_day_title" msgid="4619489296444901622">"La semana comienza el"</string>
- <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"La semana comienza el"</string>
- <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Borrar historial de búsqueda"</string>
+ <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar eventos declinados"</string>
+ <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Primer día de la semana"</string>
+ <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Primer día de la semana"</string>
+ <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Eliminar historial de búsqueda"</string>
<string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Elimina todas las búsquedas que realizaste."</string>
- <string name="search_history_cleared" msgid="1536707558435227567">"Se borró el historial de búsqueda."</string>
+ <string name="search_history_cleared" msgid="1536707558435227567">"Se eliminó el historial de búsqueda."</string>
<string name="preferences_alerts_title" msgid="6636088008103904020">"Notificaciones"</string>
<string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
<string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Elegir un tono"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3993193..242a035 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -136,7 +136,7 @@
<string name="menu_general_preferences" msgid="2812705323334260708">"Configurações gerais"</string>
<string name="menu_about_preferences" msgid="6124375438237674973">"Sobre a Agenda"</string>
<string name="preferences_title" msgid="8045855493262131773">"Configurações"</string>
- <string name="preferences_general_title" msgid="2069075513760573117">"Configuração de visualização da agenda"</string>
+ <string name="preferences_general_title" msgid="2069075513760573117">"Configuração de visualização"</string>
<string name="preferences_reminder_title" msgid="6940022527071973010">"Configurações dos lembretes"</string>
<string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar recusados"</string>
<string name="preferences_week_start_day_title" msgid="4619489296444901622">"A semana começa em"</string>
@@ -154,7 +154,7 @@
<string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Usar hora local"</string>
<string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Exibe agendas e eventos no seu fuso horário local quando você viajar"</string>
<string name="preferences_home_tz_title" msgid="6680000444088818578">"Fuso horário local"</string>
- <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número da semana"</string>
+ <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar núm. da semana"</string>
<string name="preferences_about_title" msgid="2810624892412097879">"Sobre"</string>
<string name="preferences_build_version" msgid="8242471883413502068">"Versão da compilação"</string>
<string-array name="prefEntries_alerts_vibrateWhen">
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index b956338..ddb37d1 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -22,7 +22,7 @@
<item msgid="2658001219380695677">"SMS"</item>
</string-array>
<string-array name="reminder_minutes_labels">
- <item msgid="2416970002377237011">"0-amaminithi angu"</item>
+ <item msgid="2416970002377237011">"0 amaminithi"</item>
<item msgid="6681865010714743948">"1 iminithi"</item>
<item msgid="2327505114623595779">"5 amaminithi"</item>
<item msgid="1657410063332547113">"10 amaminithi"</item>
@@ -41,7 +41,7 @@
</string-array>
<string-array name="preferences_default_reminder_labels">
<item msgid="7495163916242649023">"Lutho"</item>
- <item msgid="5883344836499335043">"0-amaminithi angu"</item>
+ <item msgid="5883344836499335043">"0 amaminithi"</item>
<item msgid="4354350447805231188">"1 iminithi"</item>
<item msgid="265674592625309858">"5 amaminithi"</item>
<item msgid="8011089417728419666">"10 amaminithi"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 62e40dd..6d4d701 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -26,7 +26,7 @@
<string name="no_title_label" msgid="302177118061368042">"(Asikho isihloko)"</string>
<plurals name="Nminutes">
<item quantity="one" msgid="4871052965772159239">"1 iminithi"</item>
- <item quantity="other" msgid="5644461630927544936">"Amaminithi angu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> amaminithi"</item>
</plurals>
<plurals name="Nmins">
<item quantity="one" msgid="9191090668359663663">"iminithi engu-1"</item>
