Merge branch 'feat/19-alarm-set-snackbar' into release/v1.0.0
# Conflicts: # app/src/main/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmsScreen.kt # docs/ARCHITECTURE.md
This commit is contained in:
commit
a186e5afcd
12 files changed
+1043
-71
No files matched your search
@@ -118,6 +118,22 @@
|
||||
<string name="alarm_next_in_days_hours">in %1$dd %2$dh</string>
|
||||
<string name="alarm_next_ringing">Ringing now</string>
|
||||
<string name="alarm_next_snoozed">Snoozed \u00b7 %1$s</string>
|
||||
<!-- #19: the chip after the user sets an alarm, short enough to sit beside the FAB. %1$s is alarm_set_days/hours/minutes, or two of them joined by alarm_set_units_pair. -->
|
||||
<string name="alarm_set_for">Alarm in %1$s</string>
|
||||
<string name="alarm_set_imminent">Alarm in less than 1 minute</string>
|
||||
<string name="alarm_set_units_pair">%1$s and %2$s</string>
|
||||
<plurals name="alarm_set_days">
|
||||
<item quantity="one">%1$d day</item>
|
||||
<item quantity="other">%1$d days</item>
|
||||
</plurals>
|
||||
<plurals name="alarm_set_hours">
|
||||
<item quantity="one">%1$d hour</item>
|
||||
<item quantity="other">%1$d hours</item>
|
||||
</plurals>
|
||||
<plurals name="alarm_set_minutes">
|
||||
<item quantity="one">%1$d minute</item>
|
||||
<item quantity="other">%1$d minutes</item>
|
||||
</plurals>
|
||||
<string name="alarm_skipping_next">Skipping next</string>
|
||||
<string name="alarm_repeat_once">Once</string>
|
||||
<string name="alarm_repeat_every_day">Every day</string>
|
||||
|
||||
Reference in new issue
Block a user