From 0a59dd5d2f8ef52c4828f9fe3c1a555519151d61 Mon Sep 17 00:00:00 2001
From: Forrest Guice <forrestguice@users.noreply.github.com>
Date: Fri, 31 Dec 2021 19:33:37 -0700
Subject: [PATCH] SelectFormat

Fixes the notification offset message to use locale specific quantity and gender rules (api24+); e.g. "del", "de la", "de los", "de las".
#522
---
 .../alarmclock/AlarmNotifications.java        | 55 ++++++++---
 app/src/main/res/values-ca/strings.xml        | 36 ++++++-
 app/src/main/res/values-cs/strings.xml        | 36 ++++++-
 app/src/main/res/values-de/strings.xml        | 72 ++++++++++----
 app/src/main/res/values-eo/strings.xml        | 36 ++++++-
 app/src/main/res/values-es/strings.xml        | 36 ++++++-
 app/src/main/res/values-eu/strings.xml        | 36 ++++++-
 app/src/main/res/values-fr/strings.xml        | 42 +++++++-
 app/src/main/res/values-hu/strings.xml        | 36 ++++++-
 app/src/main/res/values-it/strings.xml        | 36 ++++++-
 app/src/main/res/values-nb/strings.xml        | 36 ++++++-
 app/src/main/res/values-nl/strings.xml        | 36 ++++++-
 app/src/main/res/values-pl/strings.xml        | 36 ++++++-
 app/src/main/res/values-pt-rBR/strings.xml    | 36 ++++++-
 app/src/main/res/values-ru/strings.xml        | 36 ++++++-
 app/src/main/res/values-zh-rCN/strings.xml    | 36 ++++++-
 app/src/main/res/values-zh-rTW/strings.xml    | 36 ++++++-
 app/src/main/res/values/strings.xml           | 99 ++++++++++++++++++-
 18 files changed, 720 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/AlarmNotifications.java b/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/AlarmNotifications.java
index 043c57bcf..1d2491f36 100644
--- a/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/AlarmNotifications.java
+++ b/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/AlarmNotifications.java
@@ -1,5 +1,5 @@
 /**
-    Copyright (C) 2018-2020 Forrest Guice
+    Copyright (C) 2018-2021 Forrest Guice
     This file is part of SuntimesWidget.
 
     SuntimesWidget is free software: you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import android.icu.text.MessageFormat;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -649,17 +650,10 @@ public static Notification createNotification(Context context, @NonNull AlarmClo
     {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
 
-        String eventString = (alarm.event != null ? alarm.event.getShortDisplayString() : null);
-        String eventDisplay = eventString;
+        String eventDisplay = (alarm.event != null ? alarm.event.getLongDisplayString() : null);
         if (alarm.offset != 0) {
-            if (eventString == null) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTimeInMillis(alarm.timestamp);
-                eventString = utils.calendarTimeShortDisplayString(context, calendar).toString();
-            }
-            String offsetText = utils.timeDeltaLongDisplayString(0, alarm.offset).getValue();
-            int offsetStringResID = ((alarm.offset < 0) ? R.string.offset_before_msg : R.string.offset_after_msg);
-            eventDisplay = context.getString(offsetStringResID, offsetText, eventString);
+            eventDisplay = (alarm.event != null) ? formatOffsetMessage(context, alarm.offset, alarm.event)
+                                                 : formatOffsetMessage(context, alarm.offset, alarm.timestamp);
         }
 
         String emptyLabel = ((eventDisplay != null) ? eventDisplay : context.getString(R.string.alarmOption_solarevent_none));
@@ -766,6 +760,45 @@ public static Notification createNotification(Context context, @NonNull AlarmClo
         return builder.build();
     }
 
+    public static String formatOffsetMessage(Context context, long offset, @NonNull SolarEvents event)
+    {
+        int i = event.ordinal();
+        String[] eventStrings = context.getResources().getStringArray(R.array.solarevents_long1);
+        String eventText = (i >= 0 && i <eventStrings.length) ? eventStrings[i] : event.name();
+        String offsetText = utils.timeDeltaLongDisplayString(0, offset).getValue();
+
+        if (Build.VERSION.SDK_INT >= 24) {    // uses SelectFormat so translations match quantity and gender
+            int[] eventPlurals = context.getResources().getIntArray(R.array.solarevents_quantity);
+            String[] eventGenders = context.getResources().getStringArray(R.array.solarevents_gender);
+            int plural = (i >= 0 && i <eventPlurals.length) ? eventPlurals[i] : 1;
+            String gender = (i >= 0 && i <eventGenders.length) ? eventGenders[i] : "other";
+            return formatOffsetMessage(context, offset, offsetText, eventText, plural, gender);
+        } else return formatOffsetMessage(context, offset, offsetText, eventText);
+    }
+    public static String formatOffsetMessage(Context context, long offset, long timestamp)
+    {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(timestamp);
+        String eventText = utils.calendarTimeShortDisplayString(context, calendar).toString();
+        String offsetText = utils.timeDeltaLongDisplayString(0, offset).getValue();
+
+        if (Build.VERSION.SDK_INT >= 24) {    // uses SelectFormat so translations match quantity and gender
+            int plural = SuntimesUtils.is24() ? calendar.get(Calendar.HOUR_OF_DAY) : calendar.get(Calendar.HOUR);
+            String gender = context.getString(R.string.time_gender);
+            return formatOffsetMessage(context, offset, offsetText, eventText, plural, gender);
+        } else return formatOffsetMessage(context, offset, offsetText, eventText);
+    }
+    public static String formatOffsetMessage(Context context, long offset, String offsetText, String eventText) {
+        return context.getString(((offset < 0) ? R.string.offset_before_msg : R.string.offset_after_msg), offsetText, eventText);
+    }
+    @TargetApi(24)
+    public static String formatOffsetMessage(Context context, long offset, String offsetText, String eventText, int plural, String gender )
+    {
+        String pattern = context.getString(((offset < 0) ? R.string.offset_before_msg1 : R.string.offset_after_msg1));
+        //Log.d("DEBUG", "formatOffsetMessage: " + plural + " : " + gender + "\n" + pattern);
+        return new MessageFormat(pattern).format( new Object[] {offsetText, plural, gender, eventText} );
+    }
+
     /**
      * showNotification
      * Use this method to display the notification without a foreground service.
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5ad4ff093..d10dd4e48 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -115,6 +115,11 @@
         <item quantity="other">%1$s desprès</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s abans %2$s</string>     <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s desprès %2$s</string>    <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} abans {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} desprès {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">abans</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">desprès</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1111,7 +1116,7 @@
         <item>Migdia lunar</item>    
         <item>Mitjanit lunar</item>    
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>sortida de sol astronòmica</item>
         <item>sortida de sol nàutica</item>
         <item>hora blava de l\'alba (inici)</item>
@@ -1140,6 +1145,35 @@
         <item>Migdia lunar</item>    
         <item>Mitjanit lunar</item>    
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>sortida de sol astronòmica</item>
+        <item>sortida de sol nàutica</item>
+        <item>hora blava de l\'alba (inici)</item>
+        <item>sortida de sol civil</item>
+        <item>hora blava de l\'alba (fi)</item>
+        <item>sortida de sol</item>
+        <item>hora daurada del fi de l\'alba</item>
+        <item>migdia</item>
+        <item>hora daurada de l\'inici del capvespre</item>
+        <item>posta de sol</item>
+        <item>hora blava nocturna (inici)</item>
+        <item>posta de sol civil</item>
+        <item>hora blava capvespre (fi)</item>
+        <item>posta de sol nàutica</item>
+        <item>posta de sol astronòmica</item>
+        <item>sortida lunar</item>
+        <item>posta lunar</item>
+        <item>lluna nova</item>
+        <item>quart creixent</item>
+        <item>lluna plena</item>
+        <item>quart minvant</item>
+        <item>equinocci de primavera</item>
+        <item>solstici d\'estiu</item>
+        <item>equinocci de tardor</item>
+        <item>solstici d\'hivern</item>
+        <item>Migdia lunar</item>
+        <item>Mitjanit lunar</item>
+    </string-array>   <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">El GPS està desactivat. Activar-lo?</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 41ff999a0..ee40073a5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -153,6 +153,11 @@
         <item quantity="few">%1$s po</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s před %2$s</string>     <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s po %2$s</string>        <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} před {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} po {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">před</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">po</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1289,7 +1294,7 @@
         <item>lunární poledne</item>
         <item>lunární půlnoc</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>ranní astronomický soumrak (začátek)</item>
         <item>ranní nautický soumrak (začátek)</item>
         <item>ranní modrá hodina (začátek)</item>
@@ -1318,6 +1323,35 @@
         <item>lunární poledne</item>
         <item>lunární půlnoc</item>
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>ranní astronomický soumrak (začátek)</item>
+        <item>ranní nautický soumrak (začátek)</item>
+        <item>ranní modrá hodina (začátek)</item>
+        <item>ranní občanský soumrak (začátek)</item>
+        <item>ranní modrá hodina (konec)</item>
+        <item>východ slunce</item>
+        <item>ranní zlatá hodina (konec)</item>
+        <item>pravé poledne</item>
+        <item>noční zlatá hodina (začátek)</item>
+        <item>západ slunce</item>
+        <item>noční modrá hodina (začátek)</item>
+        <item>noční občanský soumrak (konec)</item>
+        <item>noční modrá hodina (konec)</item>
+        <item>noční nautický soumrak (konec)</item>
+        <item>noční astronomický soumrak (konec)</item>
+        <item>východ měsíce</item>
+        <item>západ měsíce</item>
+        <item>Nov</item>
+        <item>první čtvrť</item>
+        <item>úplněk</item>
+        <item>třetí čtvrť</item>
+        <item>jarní rovnodennost</item>
+        <item>letní slunovrat</item>
+        <item>podzimní rovnodennost</item>
+        <item>zimní slunovrat</item>
+        <item>lunární poledne</item>
+        <item>lunární půlnoc</item>
+    </string-array>   <!-- TODO: review -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS je vypnuta. Chcete ji zapnout?</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 54d670216..d24fba4c9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -113,7 +113,12 @@
   <plurals name="offset_after_plural">      <!-- e.g. "30m after \n 5:30PM" .. the time component is shown on the next line -->
     <item quantity="one">%1$s nach</item>
     <item quantity="other">%1$s nach</item>
-  </plurals>  
+  </plurals>
+
+  <string name="offset_before_msg">%1$s vor %2$s</string>      <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+  <string name="offset_after_msg">%1$s nach %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+  <string name="offset_before_msg1">{0} vor {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+  <string name="offset_after_msg1">{0} nach {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
 
   <string name="offset_button_before">vor</string>    <!-- button label; [1h] [5m] [before] (-) -->  
   <string name="offset_button_after">nach</string>      <!-- button label; [1h] [5m] [after] (+) -->  
@@ -1103,24 +1108,24 @@
     <item>Mondmittag</item>
     <item>Mondmitternacht</item>
   </string-array>
-  <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
-      <item>Astronomische Morgendämmerung (Beginn)</item>
-      <item>Nautische Morgendämmerung (Beginn)</item>
-      <item>Morgendliche Blaue Stunde (Beginn)</item>
-      <item>Bürgerliche Morgendämmerung (Beginn)</item>
-      <item>Morgendliche Blaue Stunde (Ende)</item>
-      <item>Sonnenaufgang</item>
-      <item>Morgendliche Goldene Stunde (Ende)</item>
-      <item>Mittagshöhe</item>
-      <item>Abendliche Goldene Stunde (Beginn)</item>
-      <item>Sonnenuntergang</item>
-      <item>Abendliche Blaue Stunde (Beginn)</item>
-      <item>Bürgerliche Abenddämmerung (Ende)</item>
-      <item>Abendliche Blaue Stunde (Ende)</item>
-      <item>Nautische Abenddämmerung (Ende)</item>
-      <item>Astronomische Abenddämmerung (Ende)</item>
-      <item>Mondaufgang</item>
-      <item>Monduntergang</item>
+  <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
+    <item>Astronomische Morgendämmerung (Beginn)</item>
+    <item>Nautische Morgendämmerung (Beginn)</item>
+    <item>Morgendliche Blaue Stunde (Beginn)</item>
+    <item>Bürgerliche Morgendämmerung (Beginn)</item>
+    <item>Morgendliche Blaue Stunde (Ende)</item>
+    <item>Sonnenaufgang</item>
+    <item>Morgendliche Goldene Stunde (Ende)</item>
+    <item>Mittagshöhe</item>
+    <item>Abendliche Goldene Stunde (Beginn)</item>
+    <item>Sonnenuntergang</item>
+    <item>Abendliche Blaue Stunde (Beginn)</item>
+    <item>Bürgerliche Abenddämmerung (Ende)</item>
+    <item>Abendliche Blaue Stunde (Ende)</item>
+    <item>Nautische Abenddämmerung (Ende)</item>
+    <item>Astronomische Abenddämmerung (Ende)</item>
+    <item>Mondaufgang</item>
+    <item>Monduntergang</item>
     <item>Neumond</item>
     <item>Zunehmender Halbmond</item>
     <item>Vollmond</item>
@@ -1132,6 +1137,35 @@
     <item>Mondmittag</item>
     <item>Mondmitternacht</item>
   </string-array>
+  <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+    <item>Astronomische Morgendämmerung (Beginn)</item>
+    <item>Nautische Morgendämmerung (Beginn)</item>
+    <item>Morgendliche Blaue Stunde (Beginn)</item>
+    <item>Bürgerliche Morgendämmerung (Beginn)</item>
+    <item>Morgendliche Blaue Stunde (Ende)</item>
+    <item>Sonnenaufgang</item>
+    <item>Morgendliche Goldene Stunde (Ende)</item>
+    <item>Mittagshöhe</item>
+    <item>Abendliche Goldene Stunde (Beginn)</item>
+    <item>Sonnenuntergang</item>
+    <item>Abendliche Blaue Stunde (Beginn)</item>
+    <item>Bürgerliche Abenddämmerung (Ende)</item>
+    <item>Abendliche Blaue Stunde (Ende)</item>
+    <item>Nautische Abenddämmerung (Ende)</item>
+    <item>Astronomische Abenddämmerung (Ende)</item>
+    <item>Mondaufgang</item>
+    <item>Monduntergang</item>
+    <item>Neumond</item>
+    <item>Zunehmender Halbmond</item>
+    <item>Vollmond</item>
+    <item>Abnehmender Halbmond</item>
+    <item>Frühjahrs-Tag-Nacht-Gleiche</item>
+    <item>Sommersonnenwende</item>
+    <item>Herbst-Tag-Nacht-Gleiche</item>
+    <item>Wintersonnenwende</item>
+    <item>Mondmittag</item>
+    <item>Mondmitternacht</item>
+  </string-array>  <!-- TODO: review -->
 
   <!-- Dialog: Enable GPS? -->
   <string name="gps_dialog_msg">GPS ist deaktiviert. Jetzt aktivieren?</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index b682affe5..94a240af5 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -114,6 +114,11 @@
         <item quantity="other">%1$s post</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s antaŭ %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s post %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} antaŭ {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} post {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">antaŭ</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">post</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1018,7 +1023,7 @@
         <item>plejsupro de Luno</item>
         <item>plejmalsupro de Luno</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>astronomia sunleviĝo</item>
         <item>naŭtika sunleviĝo</item>
         <item>matena blua horo (komenco)</item>
@@ -1047,6 +1052,35 @@
         <item>kulmino supra de Luno</item>
         <item>kulmino malsupra de Luno</item>
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>astronomia sunleviĝo</item>
+        <item>naŭtika sunleviĝo</item>
+        <item>matena blua horo (komenco)</item>
+        <item>civila sunleviĝo</item>
+        <item>matena blua horo (fino)</item>
+        <item>sunleviĝo</item>
+        <item>matena ora horo (fino)</item>
+        <item>tagmezo vera (kulmino)</item>
+        <item>vespera ora horo (komenco)</item>
+        <item>sunsubiro</item>
+        <item>vespera blua horo (komenco)</item>
+        <item>civila sunsubiro</item>
+        <item>vespera blua horo (fino)</item>
+        <item>naŭtika sunsubiro</item>
+        <item>astronomia sunsubiro</item>
+        <item>lunleviĝo</item>
+        <item>lunsubiro</item>
+        <item>nova Luno</item>
+        <item>kreskanta Lunduono</item>
+        <item>plena Luno</item>
+        <item>malkreskanta Lunduono</item>
+        <item>printempa tagnoktegaleco</item>
+        <item>somera sunekstremo</item>
+        <item>aŭtuna tagnoktegaleco</item>
+        <item>vintra sunekstremo</item>
+        <item>kulmino supra de Luno</item>
+        <item>kulmino malsupra de Luno</item>
+    </string-array>   <!-- TODO -->
     
   <!-- App Setting: locale mode -->
   <string name="configLabel_locale">Agordoj de lingvo</string>   <!-- group title -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 323a2d204..662368050 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -117,6 +117,11 @@
         <item quantity="other">%1$s después de las</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s antes de %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->
+    <string name="offset_before_msg1">{0} antes {1, plural, one {{2, select, female {de la} other {del}}} other {{2, select, female {de las} other {de los}}}} {3}</string>  <!-- uses SelectFormat (api24+) -->
+    <string name="offset_after_msg">%1$s después de %2$s</string>   <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->
+    <string name="offset_after_msg1">{0} después {1, plural, one {{2, select, female {de la} other {del}}} other {{2, select, female {de las} other {de los}}}} {3}</string>  <!-- uses SelectFormat (api24+)-->
+
     <string name="offset_button_before">antes</string>    <!-- button label; [1h] [5m] [before] (-) --> 
     <string name="offset_button_after">después</string>      <!-- button label; [1h] [5m] [after] (+) -->  
 
@@ -1109,7 +1114,7 @@
         <item>Mediodía lunar</item>    
         <item>Medianoche lunar</item>    
     </string-array>
-    <string-array name="solarevents_long">   
+    <string-array name="solarevents_long">      <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>Amanecer astronómico</item>
         <item>Amanecer náutico</item>
         <item>Hora azul del amanecer (inicio)</item>
@@ -1138,6 +1143,35 @@
         <item>Mediodía lunar</item>    
         <item>Medianoche lunar</item>    
     </string-array>
+    <string-array name="solarevents_long1">      <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>Amanecer astronómico</item>
+        <item>Amanecer náutico</item>
+        <item>Hora azul del amanecer (inicio)</item>
+        <item>Amanecer civil</item>
+        <item>Hora azul del amanecer (final)</item>
+        <item>Amanecer</item>
+        <item>Hora dorada del final del amanecer</item>
+        <item>Mediodía</item>
+        <item>Hora dorada del inicio del atardecer</item>
+        <item>Atardecer</item>
+        <item>Hora azul del atardecer (inicio)</item>
+        <item>Atardecer sol civil</item>
+        <item>Hora azul del atardecer (final)</item>
+        <item>Atardecer náutica</item>
+        <item>Atardecer astronómico</item>
+        <item>Salida lunar</item>
+        <item>Puesta lunar</item>
+        <item>Luna nueva</item>
+        <item>Cuarto creciente</item>
+        <item>Luna llena</item>
+        <item>Cuarto menguante</item>
+        <item>Equinoccio de primavera</item>
+        <item>Solsticio de verano</item>
+        <item>Equinoccio de otoño</item>
+        <item>Solsticio de invierno</item>
+        <item>Mediodía lunar</item>
+        <item>Medianoche lunar</item>
+    </string-array>    <!-- TODO: review -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">El GPS está desactivado. ¿Activarlo?</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index b1449270d..9492b6a77 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -119,6 +119,11 @@
         <item quantity="other">%1$s after</item>
     </plurals>  <!-- TODO -->
 
+    <string name="offset_before_msg">%1$s before %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO -->
+    <string name="offset_after_msg">%1$s after %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO -->
+    <string name="offset_before_msg1">{0} before {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO -->
+    <string name="offset_after_msg1">{0} after {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO -->
+
     <string name="offset_button_before">before</string>    <!-- button label; [1h] [5m] [before] (-) -->  <!-- TODO -->
     <string name="offset_button_after">after</string>      <!-- button label; [1h] [5m] [after] (+) -->  <!-- TODO -->
 
@@ -1119,7 +1124,7 @@
         <item>lunar noon</item>    <!-- TODO -->
         <item>lunar midnight</item>    <!-- TODO -->
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>goizeko krepuskulu astronomikoa (hasiera)</item>
         <item>goizeko itsas krepuskulua (hasiera)</item>
         <item>goizeko ordu urdina (hasiera)</item>
@@ -1148,6 +1153,35 @@
         <item>lunar noon</item>    <!-- TODO -->
         <item>lunar midnight</item>    <!-- TODO -->
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>goizeko krepuskulu astronomikoa (hasiera)</item>
+        <item>goizeko itsas krepuskulua (hasiera)</item>
+        <item>goizeko ordu urdina (hasiera)</item>
+        <item>goizeko krepuskulu zibila (hasiera)</item>
+        <item>goizeko ordu urdina (amaiera)</item>
+        <item>egunsentia</item>
+        <item>goizeko urrezko ordua (amaiera)</item>
+        <item>eguzki eguerdia</item>
+        <item>arratsaldeko urrezko ordua (hasiera)</item>
+        <item>ilunabarra</item>
+        <item>arratsaldeko ordu urdina (hasiera)</item>
+        <item>arratsaldeko krepuskulu zibila (amaiera)</item>
+        <item>arratsaldeko ordu urdina (amaiera)</item>
+        <item>arratsaldeko itsas krepuskulua (amaiera)</item>
+        <item>arratsaldeko krepuskulu astronomikoa (amaiera)</item>
+        <item>ilargiaren irteera</item>
+        <item>ilargia ezkutatzea</item>
+        <item>ilberria</item>
+        <item>lehen laurdena</item>
+        <item>ilbetea</item>
+        <item>hirugarren laurdena</item>
+        <item>udaberriko ekinokzioa</item>
+        <item>udako solstizioa</item>
+        <item>udazkeneko ekinokzioa</item>
+        <item>neguko solstizioa</item>
+        <item>lunar noon</item>    <!-- TODO -->
+        <item>lunar midnight</item>    <!-- TODO -->
+    </string-array>    <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPSa ezgaituta dago. Gaitu?</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 94a25361a..e4728ec26 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -104,15 +104,20 @@
     <plurals name="offset_at_plural">      <!-- e.g. "at \n 5:30PM" .. the time component is shown on the next line -->
         <item quantity="one" xliff:ignore="ImpliedQuantity">at</item>
         <item quantity="other">à</item>
-    </plurals>  <!-- TODO -->
+    </plurals>  <!-- TODO: review -->
     <plurals name="offset_before_plural">      <!-- e.g. "30m before \n 5:30PM" .. the time component is shown on the next line -->
         <item quantity="one">%1$s avant</item>
         <item quantity="other">%1$s avant</item>
-    </plurals>  <!-- TODO -->
+    </plurals>  <!-- TODO: review -->
     <plurals name="offset_after_plural">      <!-- e.g. "30m after \n 5:30PM" .. the time component is shown on the next line -->
         <item quantity="one">%1$s après</item>
         <item quantity="other">%1$s après</item>
-    </plurals>  <!-- TODO -->
+    </plurals>  <!-- TODO: review -->
+
+    <string name="offset_before_msg">%1$s avant %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s après %2$s</string>     <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} avant {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} après {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
 
     <string name="offset_button_before">avant</string>    <!-- button label; [1h] [5m] [before] (-) -->  <!-- TODO -->
     <string name="offset_button_after">après</string>      <!-- button label; [1h] [5m] [after] (+) -->  <!-- TODO -->
@@ -1089,7 +1094,7 @@
         <item>lunar noon</item>    <!-- TODO -->
         <item>lunar midnight</item>    <!-- TODO -->
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>crépuscule astronomique du matin</item>
         <item>crépuscule nautique du matin</item>
         <item>heure bleue du matin (début)</item>  
@@ -1118,6 +1123,35 @@
         <item>lunar noon</item>    <!-- TODO -->
         <item>lunar midnight</item>    <!-- TODO -->
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>crépuscule astronomique du matin</item>
+        <item>crépuscule nautique du matin</item>
+        <item>heure bleue du matin (début)</item>
+        <item>crépuscule civil du matin</item>
+        <item>heure bleue du matin (fin)</item>
+        <item>lever du soleil</item>
+        <item>heure dorée du matin (fin)</item>
+        <item>midi solaire</item>
+        <item>heure dorée du soir (début)</item>
+        <item>coucher du soleil</item>
+        <item>heure bleue du soir (début)</item>
+        <item>crépuscule civil du soir</item>
+        <item>heure bleue du soir (fin)</item>
+        <item>crépuscule nautique du soir</item>
+        <item>crépuscule astronomique du soir</item>
+        <item>lever de la lune</item>
+        <item>coucher de la lune</item>
+        <item>nouvelle lune</item>
+        <item>premier quartier</item>
+        <item>pleine lune</item>
+        <item>dernier quartier</item>
+        <item>Équinoxe du printemps</item>
+        <item>Solstice d\'été</item>
+        <item>Équinoxe d\'automne</item>
+        <item>Solstice d\'hiver</item>
+        <item>lunar noon</item>    <!-- TODO -->
+        <item>lunar midnight</item>    <!-- TODO -->
+    </string-array>  <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">Activer le GPS ?</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index eb0c540ba..b799df5ed 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -113,6 +113,11 @@
         <item quantity="other">%1$s after</item>
     </plurals>  <!-- TODO -->
 
+    <string name="offset_before_msg">%1$s before %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO -->
+    <string name="offset_after_msg">%1$s after %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO -->
+    <string name="offset_before_msg1">{0} before {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO -->
+    <string name="offset_after_msg1">{0} after {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO -->
+
     <string name="offset_button_before">before</string>    <!-- button label; [1h] [5m] [before] (-) -->  <!-- TODO -->
     <string name="offset_button_after">after</string>      <!-- button label; [1h] [5m] [after] (+) -->  <!-- TODO -->
 
@@ -1094,7 +1099,36 @@
         <item>lunar noon</item>    <!-- TODO -->
         <item>lunar midnight</item>    <!-- TODO -->
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">    <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
+        <item>reggel csillagászati szürkület (kezdete)</item>
+        <item>reggel hajózási szürkület (kezdete)</item>
+        <item>morning blue hour (start)</item>  <!-- TODO -->
+        <item>reggel civil szürkület (kezdete)</item>
+        <item>morning blue hour (end)</item>  <!-- TODO -->
+        <item>napkelte</item>
+        <item>morning golden hour (end)</item>  <!-- TODO -->
+        <item>szoláris dél</item>
+        <item>evening golden hour (start)</item>  <!-- TODO -->
+        <item>napnyugta</item>
+        <item>evening blue hour (start)</item>  <!-- TODO -->
+        <item>este civil szürkület (vége)</item>
+        <item>evening blue hour (end)</item>  <!-- TODO -->
+        <item>este hajózási szürkület (vége)</item>
+        <item>este csillagászati szürkület (vége)</item>
+        <item>moonrise</item>    <!-- TODO -->
+        <item>moonset</item>     <!-- TODO -->
+        <item>new moon</item>  <!-- TODO -->
+        <item>first quarter</item>  <!-- TODO -->
+        <item>full moon</item>  <!-- TODO -->
+        <item>third quarter</item>  <!-- TODO -->
+        <item>spring equinox</item>    <!-- TODO -->
+        <item>summer solstice</item>   <!-- TODO -->
+        <item>autumn equinox</item>   <!-- TODO -->
+        <item>winter solstice</item>   <!-- TODO -->
+        <item>lunar noon</item>    <!-- TODO -->
+        <item>lunar midnight</item>    <!-- TODO -->
+    </string-array>
+    <string-array name="solarevents_long1">   <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
         <item>reggel csillagászati szürkület (kezdete)</item>
         <item>reggel hajózási szürkület (kezdete)</item>
         <item>morning blue hour (start)</item>  <!-- TODO -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a9ba21ab9..a9f6208de 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -119,6 +119,11 @@
         <item quantity="other">%1$s dopo</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s prima %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s dopo %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} prima {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} dopo {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">prima</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">dopo</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1126,7 +1131,7 @@
         <item>mezzogiorno lunare</item>
         <item>mezzanotte lunare</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>astronomico crepuscolo (inizio)</item>
         <item>nautico crepuscolo mattutino (inizio)</item>
         <item>ora blu mattutino (inizio)</item>
@@ -1155,6 +1160,35 @@
         <item>mezzogiorno lunare</item>
         <item>mezzanotte lunare</item>
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>astronomico crepuscolo (inizio)</item>
+        <item>nautico crepuscolo mattutino (inizio)</item>
+        <item>ora blu mattutino (inizio)</item>
+        <item>crepuscolo civile mattutino (inizio)</item>
+        <item>ora blu mattutina (fine)</item>
+        <item>alba</item>
+        <item>ora d\'oro mattutina (fine)</item>
+        <item>mezzogiorno solare</item>
+        <item>ora d\'oro serale (inizio)</item>
+        <item>tramonto</item>
+        <item>ora blu serale (inizio)</item>
+        <item>crepuscolo civile serale (fine)</item>
+        <item>ora blu serale (fine)</item>
+        <item>nautico crepuscolo serale serale (fine)</item>
+        <item>astronomico crepuscolo serale (fine)</item>
+        <item>alba lunare</item>
+        <item>tramonto lunare</item>
+        <item>luna nuova</item>
+        <item>primo quarto</item>
+        <item>luna piena</item>
+        <item>ultimo quarto</item>
+        <item>equinozio di primavera</item>
+        <item>solstizio d\'estate</item>
+        <item>equinozio d\'autunno</item>
+        <item>solstizio d\'inverno</item>
+        <item>mezzogiorno lunare</item>
+        <item>mezzanotte lunare</item>
+    </string-array>    <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS disabilitato. Abilitarlo?</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index ed4b3cbfe..9848303b7 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -119,6 +119,11 @@
         <item quantity="other">%1$s etter</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s før %2$s</string>       <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s etter %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} før {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} etter {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">før</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">etter</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1119,7 +1124,7 @@
         <item>månens kulminasjon</item>
         <item>månens nedre kulminasjon</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>astronomisk tussmørke morgen (start)</item>
         <item>nautisk tussmørke morgen (start)</item>
         <item>blåtimen morgen (start)</item>
@@ -1148,6 +1153,35 @@
         <item>månens kulminasjon</item>
         <item>månens nedre kulminasjon</item>
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>astronomisk tussmørke morgen (start)</item>
+        <item>nautisk tussmørke morgen (start)</item>
+        <item>blåtimen morgen (start)</item>
+        <item>alminnelig tussmørke morgen (start)</item>
+        <item>blåtimen morgen (slutt)</item>
+        <item>soloppgang</item>
+        <item>gylne time morgen (slutt)</item>
+        <item>lokal middag</item>
+        <item>gylne time kveld (start)</item>
+        <item>solnedgang</item>
+        <item>blåtimen kveld (start)</item>
+        <item>alminnelig tussmørke kveld (slutt)</item>
+        <item>blåtimen kveld (slutt)</item>
+        <item>nautisk tussmørke kveld (slutt)</item>
+        <item>astronomisk tussmørke kveld (slutt)</item>
+        <item>måneoppgang</item>
+        <item>månenedgang</item>
+        <item>nymåne</item>
+        <item>ny, halvmåne</item>
+        <item>fullmåne</item>
+        <item>ne, halvmåne</item>
+        <item>vårjevndøgn</item>
+        <item>sommersolverv</item>
+        <item>høstjevndøgn</item>
+        <item>vintersolverv</item>
+        <item>månens kulminasjon</item>
+        <item>månens nedre kulminasjon</item>
+    </string-array>    <!-- TODO: review -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS er deaktivert. Aktivere nå?</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 586dc35b7..97ca91ea1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -148,6 +148,11 @@
         <item quantity="other">%1$s na</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s voor %2$s</string>   <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s na %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} voor {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} na {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">voor</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">na</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1268,7 +1273,7 @@
         <item>lunar noon</item>
         <item>lunar midnight</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>morning astronomical twilight (start)</item>
         <item>morning nautical twilight (start)</item>
         <item>morning blue hour (start)</item>
@@ -1297,6 +1302,35 @@
         <item>lunar noon</item>
         <item>lunar midnight</item>
     </string-array>
+    <string-array name="solarevents_long1">    <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>start of morning astronomical twilight</item>
+        <item>start of morning nautical twilight</item>
+        <item>start of morning blue hour</item>
+        <item>start of morning civil twilight</item>
+        <item>end of morning blue hour</item>
+        <item>Zonsopgang</item>
+        <item>end of morning golden hour</item>
+        <item>solar noon</item>
+        <item>start of evening golden hour</item>
+        <item>Zonsondergang</item>
+        <item>start of evening blue hour</item>
+        <item>end of evening civil twilight</item>
+        <item>end of evening blue hour</item>
+        <item>end of evening nautical twilight</item>
+        <item>end of evening astronomical twilight</item>
+        <item>Maanopkomst</item>
+        <item>Maansondergang</item>
+        <item>new moon</item>
+        <item>first quarter</item>
+        <item>full moon</item>
+        <item>third quarter</item>
+        <item>spring equinox</item>
+        <item>summer solstice</item>
+        <item>autumn equinox</item>
+        <item>winter solstice</item>
+        <item>lunar noon</item>
+        <item>lunar midnight</item>
+    </string-array>   <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS is disabled. Enable it?</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cb4afc2fc..898262c59 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -121,6 +121,11 @@
         <item quantity="other">%1$s po</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s przed %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s po %2$s</string>        <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} przed {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} po {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">przed</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">po</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1121,7 +1126,7 @@
         <item>górowanie Księżyca</item>
         <item>dołowanie Księżyca</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>świt astronomiczny</item>
         <item>świt żeglarski</item>
         <item>poranna błękitna godzina (początek)</item>
@@ -1150,6 +1155,35 @@
         <item>kulminacja górna Księżyca</item>
         <item>kulminacja dolna Księżyca</item>
     </string-array>
+    <string-array name="solarevents_long1">   <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>świt astronomiczny</item>
+        <item>świt żeglarski</item>
+        <item>poranna błękitna godzina (początek)</item>
+        <item>świt cywilny</item>
+        <item>poranna błękitna godzina (koniec)</item>
+        <item>wschód Słońca</item>
+        <item>poranna złota godzina (koniec)</item>
+        <item>kulminacja Słońca</item>
+        <item>wieczorna złota godzina (początek)</item>
+        <item>zachód Słońca</item>
+        <item>wieczorna błękitna godzina (początek)</item>
+        <item>zmierzch cywilny</item>
+        <item>wieczorna złota godzina (koniec)</item>
+        <item>zmierzch żeglarski</item>
+        <item>zmierzch astronomiczny</item>
+        <item>wschód Księżyca</item>
+        <item>zachód Księżyca</item>
+        <item>nów Księżyca</item>
+        <item>pierwsza kwadra Księżyca</item>
+        <item>pełnia Księżyca</item>
+        <item>ostatnia kwadra Księżyca</item>
+        <item>równonoc wiosenna</item>
+        <item>przesilenie letnie</item>
+        <item>równonoc jesienna</item>
+        <item>przesilenie zimowe</item>
+        <item>kulminacja górna Księżyca</item>
+        <item>kulminacja dolna Księżyca</item>
+    </string-array>   <!-- TODO: review -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS jest wyłączony. Czy włączyć go?</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 960b17675..32bc725e5 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -148,6 +148,11 @@
         <item quantity="other">%1$s após</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s antes das %2$s</string>  <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s após %2$s</string>        <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} antes das {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} após {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">antes</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">depois</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1161,7 +1166,7 @@
         <item>meio-dia lunar</item>
         <item>meia-noite lunar</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>crepúsculo astronômico da manhã (início)</item>
         <item>crepúsculo náutico da manhã (início)</item>
         <item>hora azul da manhã (início)</item>
@@ -1190,6 +1195,35 @@
         <item>meio-dia lunar</item>
         <item>meia-noite lunar</item>
     </string-array>
+    <string-array name="solarevents_long1">  <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>crepúsculo astronômico da manhã (início)</item>
+        <item>crepúsculo náutico da manhã (início)</item>
+        <item>hora azul da manhã (início)</item>
+        <item>crepúsculo civil de manhã (início)</item>
+        <item>hora azul da manhã (fim)</item>
+        <item>nascer do sol</item>
+        <item>hora dourada da manhã (fim)</item>
+        <item>meio dia</item>
+        <item>hora dourada da tarde (início)</item>
+        <item>pôr do sol</item>
+        <item>hora azul da tarde (início)</item>
+        <item>crepúsculo civil da tarde (fim)</item>
+        <item>hora azul da tarde (fim)</item>
+        <item>crepúsculo náutico da tarde (fim)</item>
+        <item>crepúsculo astronômico da tarde (fim)</item>
+        <item>nascer da lua</item>
+        <item>pôr da lua</item>
+        <item>lua nova</item>
+        <item>lua quarto crescente</item>
+        <item>lua cheia</item>
+        <item>lua quarto minguante</item>
+        <item>equinócio de primavera</item>
+        <item>solstício de verão</item>
+        <item>equinócio de outono</item>
+        <item>solstício de inverno</item>
+        <item>meio-dia lunar</item>
+        <item>meia-noite lunar</item>
+    </string-array>   <!-- TODO: review -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS desligado. Deseja ligar?</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4a25fb511..51f18f4bc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -155,6 +155,11 @@
         <item quantity="many">%1$s после</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s до %2$s</string>        <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s после %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} до {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} после {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">до</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">после</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1290,7 +1295,7 @@
         <item>Лунный полдень</item>
         <item>Лунная полночь</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>Утренние астроном. сум. (начало)</item>
         <item>Утренние навигац. сум. (начало)</item>
         <item>Утреннее режимное время (начало)</item>
@@ -1319,6 +1324,35 @@
         <item>Лунный полдень</item>
         <item>Лунная полночь</item>
     </string-array>
+    <string-array name="solarevents_long1">   <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>Утренние астроном. сум. (начало)</item>
+        <item>Утренние навигац. сум. (начало)</item>
+        <item>Утреннее режимное время (начало)</item>
+        <item>Утренние гражданские сум. (начало)</item>
+        <item>Утреннее режимное время (конец)</item>
+        <item>Восход солнца</item>
+        <item>Утренний золотой час (конец)</item>
+        <item>Солнечный полдень</item>
+        <item>Вечерний золотой час (начало)</item>
+        <item>Заход солнца</item>
+        <item>Вечернее режимное время (начало)</item>
+        <item>Вечерние гражданские сум. (конец)</item>
+        <item>Вечернее режимное время (конец)</item>
+        <item>Вечерние навигац. сум. (конец)</item>
+        <item>Вечерние астроном. сум. (конец)</item>
+        <item>Восход луны</item>
+        <item>Заход луны</item>
+        <item>Новолуние</item>
+        <item>Первая четверть</item>
+        <item>Полнолуние</item>
+        <item>Третья четверть</item>
+        <item>Весеннее равноденствие</item>
+        <item>Летнее солнцестояние</item>
+        <item>Осеннее равноденствие</item>
+        <item>Зимнее солнцестояние</item>
+        <item>Лунный полдень</item>
+        <item>Лунная полночь</item>
+    </string-array>  <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS выключен. Включить GPS?</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0707e8d56..eea342cbf 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -119,6 +119,11 @@
         <item quantity="other">%1$s 之后</item>
     </plurals>
 
+    <string name="offset_before_msg">%1$s 之前 %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s 之后 %2$s</string>     <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} 之前 {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} 之后 {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+
     <string name="offset_button_before">之前</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">之后</string>      <!-- button label; [1h] [5m] [after] (+) -->
 
@@ -1126,7 +1131,7 @@
         <item>月亮正午</item>
         <item>月夜</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>天文曙光</item>
         <item>航海曙光</item>
         <item>蓝色时刻（开始）</item>
@@ -1155,6 +1160,35 @@
         <item>月亮正午</item>
         <item>月夜</item>
     </string-array>
+    <string-array name="solarevents_long1">   <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>天文曙光</item>
+        <item>航海曙光</item>
+        <item>蓝色时刻（开始）</item>
+        <item>民用曙光</item>
+        <item>蓝色时刻（结束）</item>
+        <item>日出</item>
+        <item>黄金时刻（结束）</item>
+        <item>正午</item>
+        <item>黄金时刻（开始）</item>
+        <item>日落</item>
+        <item>蓝色时刻（开始）</item>
+        <item>民用暮光</item>
+        <item>蓝色时刻（结束）</item>
+        <item>航海暮光</item>
+        <item>天文暮光</item>
+        <item>月出</item>
+        <item>月落</item>
+        <item>新月</item>
+        <item>上弦月</item>
+        <item>满月</item>
+        <item>下弦月</item>
+        <item>春分</item>
+        <item>夏至</item>
+        <item>秋分</item>
+        <item>冬至</item>
+        <item>月亮正午</item>
+        <item>月夜</item>
+    </string-array>  <!-- TODO: review -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS已被禁用，要启用吗？</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9c73b6c7b..516d1f0c5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -118,6 +118,10 @@
         <!--<item quantity="one">%1$s after</item>-->
         <item quantity="other">%1$s 之後</item>
     </plurals>
+    <string name="offset_before_msg">%1$s 之前 %2$s</string>      <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s 之後 %2$s</string>       <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} 之前 {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} 之後 {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
 
     <string name="offset_button_before">之前</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">之後</string>      <!-- button label; [1h] [5m] [after] (+) -->
@@ -1126,7 +1130,7 @@
         <item>月亮正午</item>
         <item>月夜</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>天文曙光</item>
         <item>航海曙光</item>
         <item>藍色時刻（開始）</item>
@@ -1155,6 +1159,36 @@
         <item>月亮正午</item>
         <item>月夜</item>
     </string-array>
+    <string-array name="solarevents_long1">   <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>天文曙光</item>
+        <item>航海曙光</item>
+        <item>藍色時刻（開始）</item>
+        <item>民用曙光</item>
+        <item>藍色時刻（結束）</item>
+        <item>日出</item>
+        <item>黃金時刻（結束）</item>
+        <item>正午</item>
+        <item>黃金時刻（開始）</item>
+        <item>日落</item>
+        <item>藍色時刻（開始）</item>
+        <item>民用暮光</item>
+        <item>藍色時刻（結束）</item>
+        <item>航海暮光</item>
+        <item>天文暮光</item>
+        <item>月出</item>
+        <item>月落</item>
+        <item>新月</item>
+        <item>上弦月</item>
+        <item>滿月</item>
+        <item>下弦月</item>
+        <item>春分</item>
+        <item>夏至</item>
+        <item>秋分</item>
+        <item>冬至</item>
+        <item>月亮正午</item>
+        <item>月夜</item>
+    </string-array>    <!-- TODO: review -->
+
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS已被禁用，要啟用嗎？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac0238998..2d933dbf3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,9 +149,11 @@
         <item quantity="one">%1$s after</item>
         <item quantity="other">%1$s after</item>
     </plurals>
-    <string name="offset_at_msg">%1$s at %2$s</string>            <!-- notification msg; 'at Sunset'; second arg is always non-plural -->   <!-- TODO -->
-    <string name="offset_before_msg">%1$s before %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO -->
-    <string name="offset_after_msg">%1$s after %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO -->
+
+    <string name="offset_before_msg">%1$s before %2$s</string>    <!-- notification msg; '1h 30m before Sunset'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_after_msg">%1$s after %2$s</string>      <!-- notification msg; '1h 30m after end of evening civil twilight'; second arg is always non-plural -->   <!-- TODO: review -->
+    <string name="offset_before_msg1">{0} before {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
+    <string name="offset_after_msg1">{0} after {1, plural, one {{2, select, female {} other {}}} other {{2, select, female {} other {}}}}{3}</string>  <!-- uses SelectFormat (api24+) -->  <!-- TODO: review -->
 
     <string name="offset_button_before">before</string>    <!-- button label; [1h] [5m] [before] (-) -->
     <string name="offset_button_after">after</string>      <!-- button label; [1h] [5m] [after] (+) -->
@@ -1419,7 +1421,7 @@
         <item>lunar noon</item>
         <item>lunar midnight</item>
     </string-array>
-    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->
+    <string-array name="solarevents_long">   <!-- one-to-one with solarevents_short -->  <!-- short labels; ending may be ellipsed (so the beginning should be distinct)  -->
         <item>morning astronomical twilight (start)</item>
         <item>morning nautical twilight (start)</item>
         <item>morning blue hour (start)</item>
@@ -1448,6 +1450,95 @@
         <item>lunar noon</item>
         <item>lunar midnight</item>
     </string-array>
+    <string-array name="solarevents_long1">   <!-- one-to-one with solarevents_long -->  <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
+        <item>start of morning astronomical twilight</item>
+        <item>start of morning nautical twilight</item>
+        <item>start of morning blue hour</item>
+        <item>start of morning civil twilight</item>
+        <item>end of morning blue hour</item>
+        <item>sunrise</item>
+        <item>end of morning golden hour</item>
+        <item>solar noon</item>
+        <item>start of evening golden hour</item>
+        <item>sunset</item>
+        <item>start of evening blue hour</item>
+        <item>end of evening civil twilight</item>
+        <item>end of evening blue hour</item>
+        <item>end of evening nautical twilight</item>
+        <item>end of evening astronomical twilight</item>
+        <item>moonrise</item>
+        <item>moonset</item>
+        <item>new moon</item>
+        <item>first quarter</item>
+        <item>full moon</item>
+        <item>third quarter</item>
+        <item>spring equinox</item>
+        <item>summer solstice</item>
+        <item>autumn equinox</item>
+        <item>winter solstice</item>
+        <item>lunar noon</item>
+        <item>lunar midnight</item>
+    </string-array>
+
+    <string-array name="solarevents_gender">   <!-- one-to-one with solarevents_long1; values used by SelectFormat (api24+) -->
+        <item>other</item>    <!-- start of astronomical twilight -->
+        <item>other</item>    <!-- start of nautical twilight -->
+        <item>other</item>    <!-- start of morning blue hour -->
+        <item>other</item>    <!-- start of civil twilight -->
+        <item>other</item>    <!-- end of morning blue hour -->
+        <item>other</item>    <!-- sunrise -->
+        <item>other</item>    <!-- start of golden hour -->
+        <item>other</item>    <!-- solar noon -->
+        <item>other</item>    <!-- end of golden hour -->
+        <item>other</item>    <!-- sunset -->
+        <item>other</item>    <!-- start of evening blue hour -->
+        <item>other</item>    <!-- end of civil twilight -->
+        <item>other</item>    <!-- end of evening blue hour -->
+        <item>other</item>    <!-- end of nautical twilight -->
+        <item>other</item>    <!-- end of astronomical twilight -->
+        <item>female</item>   <!-- moonrise -->
+        <item>female</item>   <!-- moonset -->
+        <item>female</item>   <!-- new moon -->
+        <item>other</item>    <!-- first quarter -->
+        <item>female</item>   <!-- full moon -->
+        <item>other</item>    <!-- third quarter -->
+        <item>other</item>    <!-- spring solstice -->
+        <item>other</item>    <!-- summer solstice -->
+        <item>other</item>    <!-- autumn equinox -->
+        <item>other</item>    <!-- winter solstice -->
+        <item>other</item>    <!-- lunar noon -->
+        <item>female</item>   <!-- lunar midnight -->
+    </string-array>
+    <integer-array name="solarevents_quantity">   <!-- one-to-one with solarevents_short; values used by SelectFormat (api24+) -->
+        <item>1</item>    <!-- start of astronomical twilight -->
+        <item>1</item>    <!-- start of nautical twilight -->
+        <item>1</item>    <!-- start of morning blue hour -->
+        <item>1</item>    <!-- start of civil twilight -->
+        <item>1</item>    <!-- end of morning blue hour -->
+        <item>1</item>    <!-- sunrise -->
+        <item>1</item>    <!-- start of golden hour -->
+        <item>1</item>    <!-- solar noon -->
+        <item>1</item>    <!-- end of golden hour -->
+        <item>1</item>    <!-- sunset -->
+        <item>1</item>    <!-- start of evening blue hour -->
+        <item>1</item>    <!-- end of civil twilight -->
+        <item>1</item>    <!-- end of evening blue hour -->
+        <item>1</item>    <!-- end of nautical twilight -->
+        <item>1</item>    <!-- end of astronomical twilight -->
+        <item>1</item>    <!-- moonrise -->
+        <item>1</item>    <!-- moonset -->
+        <item>1</item>    <!-- new moon -->
+        <item>1</item>    <!-- first quarter -->
+        <item>1</item>    <!-- full moon -->
+        <item>1</item>    <!-- third quarter -->
+        <item>1</item>    <!-- spring solstice -->
+        <item>1</item>    <!-- summer solstice -->
+        <item>1</item>    <!-- autumn equinox -->
+        <item>1</item>    <!-- winter solstice -->
+        <item>1</item>    <!-- lunar noon -->
+        <item>1</item>    <!-- lunar midnight -->
+    </integer-array>
+    <string name="time_gender">female</string>   <!-- SelectFormat (api24+) time phrase gender (if applicable); expects 'female', 'other', etc; e.g. in Spanish hours are feminine ("de las 5:30") --> <!-- TODO -->
 
     <!-- Dialog: Enable GPS? -->
     <string name="gps_dialog_msg">GPS is disabled. Enable it?</string>