merge in nyc-release history after reset to nyc-dev
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ef3b15a..044ddfb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -105,7 +105,7 @@
<item quantity="one">minuto</item>
</plurals>
<string name="crescendo_duration_title" msgid="8606408542726189528">"Subir el volumen de forma gradual"</string>
- <string name="no_crescendo_duration" msgid="383801592865899932">"Desactivada"</string>
+ <string name="no_crescendo_duration" msgid="383801592865899932">"Desactivado"</string>
<string name="crescendo_duration" msgid="6641284876778266541">"<xliff:g id="NUMBER">%s</xliff:g> segundos"</string>
<string name="crescendo_picker_label" msgid="7758024047003091056">"segundos"</string>
<string name="auto_silence_title" msgid="2012754009554434544">"Silenciar automáticamente"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 949d5ef..c73e4f9 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -79,15 +79,15 @@
</string-array>
<plurals name="days" formatted="false" msgid="3706846447285206235">
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> egun</item>
- <item quantity="one">Egun bat</item>
+ <item quantity="one">1 egun</item>
</plurals>
<plurals name="hours" formatted="false" msgid="3871283109767171655">
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ordu</item>
- <item quantity="one">Ordubete</item>
+ <item quantity="one">1 ordu</item>
</plurals>
<plurals name="minutes" formatted="false" msgid="5484431721696058697">
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutu</item>
- <item quantity="one">Minutu bat</item>
+ <item quantity="one">1 minutu</item>
</plurals>
<string name="every_day" msgid="4100909974923444602">"Egunero"</string>
<string name="day_concat" msgid="971998564991636532">", "</string>
@@ -111,7 +111,7 @@
<string name="auto_silence_title" msgid="2012754009554434544">"Gelditu tarte hau igaro ondoren"</string>
<plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">
<item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutu</item>
- <item quantity="one">Minutu bat</item>
+ <item quantity="one">1 minutu</item>
</plurals>
<string name="auto_silence_never" msgid="4821982647348750809">"Inoiz ez"</string>
<string-array name="auto_silence_entries">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e674bed..515e970 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -82,10 +82,10 @@
<item msgid="2332583385137381060">"Signalas nustatytas skambėti po <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> ir <xliff:g id="MINUTES">%3$s</xliff:g> nuo dabar."</item>
</string-array>
<plurals name="days" formatted="false" msgid="3706846447285206235">
- <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> diena</item>
- <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> dienos</item>
- <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> dienos</item>
- <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dienų</item>
+ <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> d.</item>
+ <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> d.</item>
+ <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> d.</item>
+ <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> d.</item>
</plurals>
<plurals name="hours" formatted="false" msgid="3871283109767171655">
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> valanda</item>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 3f2e20a..774982a 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -137,7 +137,7 @@
<string name="unknown_ringtone_title" msgid="6637522029614550112">"ਅਗਿਆਤ"</string>
<string name="alarm_notify_text" msgid="4891014685945904766">"ਅਲਾਰਮ ਸਨੂਜ਼ ਕਰੋ ਜਾਂ ਖਾਰਜ ਕਰੋ।"</string>
<string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (ਸਨੂਜ਼ ਕੀਤਾ)"</string>
- <string name="alarm_notify_snooze_text" msgid="4819324081410990368">"ਅਲਾਰਮ <xliff:g id="TIME">%s</xliff:g> ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ। ਰੱਦ ਕਰਨ ਲਈ ਛੋਹਵੋ।"</string>
+ <string name="alarm_notify_snooze_text" msgid="4819324081410990368">"ਅਲਾਰਮ <xliff:g id="TIME">%s</xliff:g> ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ। ਰੱਦ ਕਰਨ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ।"</string>
<string name="volume_button_setting_title" msgid="6937131248843413357">"ਵੌਲਿਊਮ ਬਟਨ"</string>
<string name="volume_button_dialog_title" msgid="8768042543750036853">"ਬਟਨ ਇਫੈਕਟ"</string>
<string-array name="volume_button_setting_entries">
@@ -349,7 +349,7 @@
<string name="timer_stopped" msgid="2730331837832462008">"ਟਾਈਮਰ ਰੋਕਿਆ ਗਿਆ"</string>
<string name="timer_paused" msgid="5941160896040771462">"ਟਾਈਮਰ ਰੋਕਿਆ"</string>
<string name="timers_stopped" msgid="3186191253226005149">"<xliff:g id="NUMBER">%d</xliff:g> ਟਾਈਮਰ ਰੋਕੇ ਗਏ"</string>
- <string name="all_timers_stopped_notif" msgid="278532320068394600">"ਆਪਣੇ ਟਾਈਮਰ ਦੇਖਣ ਲਈ ਛੋਹਵੋ"</string>
+ <string name="all_timers_stopped_notif" msgid="278532320068394600">"ਆਪਣੇ ਟਾਈਮਰ ਦੇਖਣ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ"</string>
<string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> ਟਾਈਮਰ"</string>
<string name="next_timer_notif" msgid="6136454740115613653">"ਅਗਲਾ ਟਾਈਮਰ: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
<string name="screensaver_settings" msgid="7013450738357352801">"ਸੁਪਨ ਸੈਟਿੰਗਾਂ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e443903..bada513 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -358,7 +358,7 @@
<string name="expand_alarm" msgid="7392616528943305020">"Expandir alarme"</string>
<string name="collapse_alarm" msgid="3561772046433483980">"Reduzir alarme"</string>
<string name="alarm_undo" msgid="5710042601177655254">"anular"</string>
- <string name="alarm_deleted" msgid="6131529309389084785">"Despertador eliminado"</string>
+ <string name="alarm_deleted" msgid="6131529309389084785">"Alarme eliminado"</string>
<string name="slash" msgid="2077577763821006919">"/"</string>
<string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
<string name="next_alarm_description" msgid="2650244835760747046">"Próximo alarme: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
