v23.1 (#235)

* ru: update from translator * Change twelve hour format to use US locale to fix parsing failure * French translation update. Round up sprouts values (#236) * Update versionCode and versionName --------- Co-authored-by: marc-medley <[email protected]>
nutritionfactsorg · Oct 7, 2023 · 5059897 · 5059897
1 parent 25d8275
commit 5059897
Show file tree

Hide file tree

Showing 20 changed files with 70 additions and 70 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         multiDexEnabled true
         targetSdkVersion 33
         vectorDrawables.useSupportLibrary = true
-        versionCode 84
-        versionName "23"
+        versionCode 85
+        versionName "23.1"
     }
     buildTypes {
         debug {

diff --git a/app/src/main/java/org/nutritionfacts/dailydozen/model/pref/UpdateReminderPref.java b/app/src/main/java/org/nutritionfacts/dailydozen/model/pref/UpdateReminderPref.java
@@ -129,7 +129,7 @@ public long getNextAlarmTimeInMillis(Context context) {
     }
 
     private static class TimeStringComparator implements Comparator<String> {
-        private final DateFormat twelveHourFormat = new SimpleDateFormat("h:mm a", Locale.getDefault());
+        private final DateFormat twelveHourFormat = new SimpleDateFormat("h:mm a", Locale.US);
         private final DateFormat twentyFourHourFormat = new SimpleDateFormat("H:mm", Locale.getDefault());
 
         @Override

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 грам нарязани цветнолистни</item>
-        <item>78 грам брюкселско зеле</item>
-        <item>14 грам кълнове от броколи</item>
+        <item>80 грам брюкселско зеле</item>
+        <item>15 грам кълнове от броколи</item>
         <item>1 супена лъжица хрян</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30-80 g tallat</item>
-        <item>78 g de cols de Brussel·les</item>
-        <item>14 g brots de bròquil</item>
+        <item>80 g de cols de Brussel·les</item>
+        <item>15 g brots de bròquil</item>
         <item>1 cullerada de rave picant</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g nakrájené</item>
-        <item>78 g růžičkové kapusty</item>
-        <item>14 g brokolicových klíčků</item>
+        <item>80 g růžičkové kapusty</item>
+        <item>15 g brokolicových klíčků</item>
         <item>1 lžíce křenu</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g gehackt</item>
-        <item>78 g Rosenkohl</item>
-        <item>14 g Broccolisprossen</item>
+        <item>80 g Rosenkohl</item>
+        <item>15 g Broccolisprossen</item>
         <item>1 Eßlöffel Meerrettich</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 γραμμάρια ψιλοκομμένα</item>
-        <item>78 γραμμάρια λαχανάκια Βρυξελλών</item>
-        <item>14 γραμμάρια φύτρα μπρόκολου</item>
+        <item>80 γραμμάρια λαχανάκια Βρυξελλών</item>
+        <item>15 γραμμάρια φύτρα μπρόκολου</item>
         <item>1 κουταλιά της σούπας χρένο</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g picadas</item>
-        <item>78 g de coles de Bruselas</item>
-        <item>14 g de brotes de brócoli</item>
+        <item>80 g de coles de Bruselas</item>
+        <item>15 g de brotes de brócoli</item>
         <item>1 cucharada de rábano picante</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -8,7 +8,7 @@
     <string name="greens">Légumes verts</string>
     <string name="other_vegetables">Autres légumes</string>
     <string name="flaxseeds">Graines de lin</string>
-    <string name="nuts">Noix</string>
+    <string name="nuts">Noix et graines</string>
     <string name="spices">Épices et herbes aromatiques</string>
     <string name="whole_grains">Céréales complètes</string>
     <string name="beverages">Boissons</string>
@@ -24,12 +24,12 @@
     <string name="moving_average">Moyenne mobile</string>
     <string name="about">À propos</string>
     <string name="about_this_app">À propos de cette app</string>
-    <string name="about_translators">Remerciements particuliers à nos traducteurs bénévoles : Petar Enchev (bg), Tsveti Enchev (bg), Ricard Soler Roger (ca), Luděk Bouška (cs,sk), Lenka Lukacová (cs), Anke Schliessmann (de), Ángela Graña (es), Audray Harkins (fr), Doron Barak (he), Ruth Levy (he), Annalisa Guerrini-Körner (it), Ilaria Zanini (it), Hanna Gurzeda (pl), Joanna Klopotek (pl), Tania Bassi (pt-BR), João Madureira (pt-PT), Cristina Lauby (ro), Evgeniya Lyakh (ru), Katarína Mocáková (sk).</string>
+    <string name="about_translators">Remerciements particuliers à nos traducteurs bénévoles: Petar Enchev (bg), Tsveti Enchev (bg), Ricard Soler Roger (ca), Luděk Bouška (cs,sk), Lenka Lukacová (cs), Anke Schliessmann (de), Ángela Graña (es), Audray Harkins (fr), Doron Barak (he), Ruth Levy (he), Annalisa Guerrini-Körner (it), Ilaria Zanini (it), Hanna Gurzeda (pl), Joanna Klopotek (pl), Tania Bassi (pt-BR), João Madureira (pt-PT), Cristina Lauby (ro), Evgeniya Lyakh (ru), Katarína Mocáková (sk).</string>
     <string name="latest_videos">Dernières vidéos</string>
     <string name="donate">Faire un don</string>
     <string name="subscribe">Souscrire</string>
     <string name="open_source">Open source</string>
-    <string name="permission_needed_to_write_storage">Impossible de sauvegarder sans accès au stockage</string>
+    <string name="permission_needed_to_write_storage">Impossible de sauvegarder sans autorisation d\'accès au stockage</string>
     <string name="backup_failed">Échec de la sauvegarde</string>
     <string name="restore_failed">Échec</string>
     <string name="backup_success">Sauvegarde réussie</string>
@@ -83,7 +83,7 @@
     <string name="channel_reminders_name">Rappels</string>
     <string name="twenty_one_tweaks">21 Astuces</string>
     <string name="tweaks">Astuces</string>
-    <string name="daily_tweaks_history">Historique des modifications par jour</string>
+    <string name="daily_tweaks_history">Historique des astuces par jour</string>
     <string name="weight_history">Historique Poids</string>
     <string name="no_weights_recorded">Vous n\'avez pas encore enregistré de poids !</string>
     <string name="task_loading_weights_history_title">Chargement de l\'historique de poids en cours</string>
@@ -251,7 +251,7 @@
         <item>Kiwis</item>
         <item>Citrons</item>
         <item>Citrons verts</item>
-        <item>Lychees</item>
+        <item>Litchi</item>
         <item>Mangues</item>
         <item>Nectarines</item>
         <item>Oranges</item>
@@ -309,7 +309,7 @@
         <item>Pommes de terre</item>
         <item>Citrouille</item>
         <item>Algues (brunes, rouges, vertes)</item>
-        <item>Petits pois</item>
+        <item>Pois gourmand</item>
         <item>Courges</item>
         <item>Patates douces/Ignames</item>
         <item>Tomates</item>
@@ -342,10 +342,10 @@
         <item>Laurier</item>
         <item>Cardamome</item>
         <item>Poudre de piment</item>
-        <item>Coriandre fraîche</item>
+        <item>Coriandre (feuilles)</item>
         <item>Cannelle</item>
         <item>Clous de girofle</item>
-        <item>Coriandre</item>
+        <item>Coriandre (graines)</item>
         <item>Cumin</item>
         <item>Curry en poudre</item>
         <item>Aneth</item>
@@ -439,7 +439,7 @@
         <item>Corde à sauter</item>
         <item>Crosse</item>
         <item>Pompes</item>
-        <item>Abdos</item>
+        <item>Tractions</item>
         <item>Racquetball</item>
         <item>Escalade</item>
         <item>Rugby</item>
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g hachés</item>
-        <item>78 g de choux de Bruxelles</item>
-        <item>14 g de pousses de brocoli</item>
+        <item>80 g de choux de Bruxelles</item>
+        <item>15 g de pousses de brocoli</item>
         <item>1 cuillère à soupe de raifort</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30-80 גרם קצוצים</item>
-        <item>78 גרם כרוב ניצנים</item>
-        <item>14 גרם נבטי ברוקולי</item>
+        <item>80 גרם כרוב ניצנים</item>
+        <item>15 גרם נבטי ברוקולי</item>
         <item>כף חזרת</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -488,14 +488,14 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>30–80 g tagliate</item>
-        <item>78 g di cavolini di Bruxelles</item>
-        <item>14 g di germogli di broccoli</item>
+        <item>80 g di cavolini di Bruxelles</item>
+        <item>15 g di germogli di broccoli</item>
         <item>1 cucchiaio di rafano</item>
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g tagliate</item>
-        <item>78 g di cavolini di Bruxelles</item>
-        <item>14 g di germogli di broccoli</item>
+        <item>80 g di cavolini di Bruxelles</item>
+        <item>15 g di germogli di broccoli</item>
         <item>1 cucchiaio di rafano</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30-80 גרם קצוצים</item>
-        <item>78 גרם כרוב ניצנים</item>
-        <item>14 גרם נבטי ברוקולי</item>
+        <item>80 גרם כרוב ניצנים</item>
+        <item>15 גרם נבטי ברוקולי</item>
         <item>כף חזרת</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g posiekanych</item>
-        <item>78 g brukselki</item>
-        <item>14 g  kiełków brokułu</item>
+        <item>80 g brukselki</item>
+        <item>15 g  kiełków brokułu</item>
         <item>1 łyżka chrzanu</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g de crucíferos picados</item>
-        <item>78 g de couve de Bruxelas</item>
-        <item>14 g brotos de brócolis</item>
+        <item>80 g de couve de Bruxelas</item>
+        <item>15 g brotos de brócolis</item>
         <item>1 colher de sopa de rábano-silvestre</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g de crucíferos picados</item>
-        <item>78 g de rebentos de Couves-de-Bruxelas</item>
-        <item>14 g de rebentos de Brócolos</item>
+        <item>80 g de rebentos de Couves-de-Bruxelas</item>
+        <item>15 g de rebentos de Brócolos</item>
         <item>1 colher de sopa de Rábano Sivlestre</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
@@ -494,8 +494,8 @@
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g tocate</item>
-        <item>78 g varză de Bruxelles</item>
-        <item>14 g cană germeni de broccoli</item>
+        <item>80 g varză de Bruxelles</item>
+        <item>15 g cană germeni de broccoli</item>
         <item>1 lingură de hrean</item>
     </string-array>
     <string-array name="food_info_serving_sizes_greens_imperial">