Merge branch 'feat/20-swipe-delete-undo' into release/v1.0.0

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/de/jeanlucmakiola/clockula/alarm/AlarmEngine.kt
#	app/src/main/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmEditorViewModel.kt
#	app/src/main/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmRow.kt
#	app/src/main/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmsScreen.kt
#	app/src/main/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmsViewModel.kt
#	app/src/main/java/de/jeanlucmakiola/clockula/ui/timers/TimersScreen.kt
#	app/src/test/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmEditorViewModelTest.kt
#	app/src/test/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmsViewModelTest.kt
#	docs/ROADMAP.md

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

@@ -69,6 +69,7 @@
     <string name="timer_editor_sound">Sound</string>
     <string name="timer_editor_delete">Delete timer</string>
     <string name="timer_editor_delete_confirm">Delete this timer?</string>
+    <string name="timer_deleted">Timer deleted</string>
 
     <!-- M6: the timer notification. One channel, one id, however many timers. -->
     <string name="channel_timers_name">Timers</string>
@@ -166,9 +167,9 @@
     <string name="editor_snooze_limit">Snooze limit</string>
     <string name="editor_dismiss_challenge">To dismiss</string>
     <string name="editor_delete">Delete alarm</string>
-    <string name="editor_delete_title">Delete this alarm?</string>
-    <string name="editor_delete_message">The %1$s alarm will be removed.</string>
+    <string name="alarm_deleted">%1$s alarm deleted</string>
     <string name="action_delete">Delete</string>
+    <string name="action_undo">Undo</string>
     <string name="action_cancel">Cancel</string>
     <string name="action_ok">OK</string>