Merge branch 'feat/16-upcoming-alarm-notification' into release/v1.0.0

# Conflicts:
#	app/src/main/java/de/jeanlucmakiola/clockula/ClockulaApp.kt

app/src/main/res/values/strings.xml

@@ -10,6 +10,10 @@
     <string name="channel_alarm_ring_description">The full-screen alarm while it is ringing. Turning this off does not silence an alarm.</string>
     <string name="channel_alarm_snoozed_name">Snoozed alarms</string>
     <string name="channel_alarm_snoozed_description">A quiet reminder that an alarm is snoozed, and when it comes back.</string>
+    <string name="channel_alarm_upcoming_name">Upcoming alarms</string>
+    <string name="channel_alarm_upcoming_description">A silent note up to two hours before an alarm rings, so you can dismiss it if you are already up. Turning this off does not affect the alarm.</string>
+    <string name="alarm_upcoming_title">Upcoming alarm</string>
+    <string name="alarm_upcoming_text_labelled">%1$s · %2$s</string>
     <string name="alarm_notification_title">Alarm</string>
     <string name="alarm_action_snooze">Snooze</string>
     <string name="alarm_action_dismiss">Dismiss</string>
@@ -102,6 +106,7 @@
     <string name="alarms_add">Add alarm</string>
     <string name="alarms_empty_hint">Tap + to set your first alarm</string>
     <string name="alarm_row_toggle">Alarm at %1$s</string>
+    <string name="alarm_row_dismiss_upcoming">Dismiss the alarm at %1$s</string>
     <string name="alarm_next_imminent">in less than a minute</string>
     <plurals name="alarm_next_in_minutes">
         <item quantity="one">in %1$d min</item>