From 8b5c3c99e9129a95bd95d7096d1d696b5b3c2aa4 Mon Sep 17 00:00:00 2001
From: John Slavick <slavick@users.noreply.github.com>
Date: Sun, 23 May 2021 18:14:40 -0500
Subject: [PATCH] v19.1 (#192)

* Remove broken video links

* Fix video links

* Add contributor tabasco-flame

* Reformat strings files

* Update `versionCode` and `versionName`
---
 README.md                              |   2 +
 app/build.gradle                       |   4 +-
 app/src/main/res/values-bg/strings.xml |  44 +--
 app/src/main/res/values-de/strings.xml | 512 ++++++++++++-------------
 app/src/main/res/values-el/strings.xml |  52 +--
 app/src/main/res/values-es/strings.xml |  14 +-
 app/src/main/res/values-fr/strings.xml |  40 +-
 app/src/main/res/values-it/strings.xml |  40 +-
 app/src/main/res/values-pl/strings.xml |  49 ++-
 app/src/main/res/values-pt/strings.xml |   4 +-
 app/src/main/res/values-ro/strings.xml |  40 +-
 app/src/main/res/values-ru/strings.xml |  40 +-
 app/src/main/res/values-zh/strings.xml |  42 +-
 app/src/main/res/values/strings.xml    | 134 +++----
 14 files changed, 509 insertions(+), 508 deletions(-)

diff --git a/README.md b/README.md
index 029602a5..4b9f4474 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Contributors
 * [myang310][myang310]
 * [notmypassword][notmypassword]
 * [qyearsley][qyearsley]
+* [tabasco-flame][tabasco-flame]
 
 [nutritionfacts.org]: http://nutritionfacts.org "NutritionFacts.org - The Latest in Nutrition Research"
 [contribute]: https://github.com/nutritionfactsorg/daily-dozen-android/blob/master/CONTRIBUTING.md "Contribute to the Daily Dozen Android App"
@@ -76,3 +77,4 @@ Contributors
 [angelagvarela]: https://github.com/angelagvarela "angelagvarela on GitHub"
 [josephkelemen97]: https://github.com/josephkelemen97 "josephkelemen97 on GitHub"
 [marc-medley]: https://github.com/marc-medley "marc-medley on GitHub"
+[tabasco-flame]: https://github.com/tabasco-flame "tabasco-flame on GitHub"
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9689e61d..0d456190 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,8 +39,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         vectorDrawables.useSupportLibrary = true
-        versionCode 57
-        versionName "19"
+        versionCode 58
+        versionName "19.1"
     }
     buildTypes {
         debug {
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 07fbc211..d0213d84 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -67,8 +67,8 @@
     <string name="dialog_ask_user_to_rate_app_message">Моля, дайте ни обратна връзка в Google Play Store.</string>
     <string name="rate_now">Изпратете обратна информация</string>
     <string name="not_now">Пропусни</string>
-    <string formatted="false" name="format_version">версия %s</string>
-    <string formatted="false" name="format_num_days">%d дни</string>
+    <string name="format_version" formatted="false">версия %s</string>
+    <string name="format_num_days" formatted="false">%d дни</string>
     <string name="daily_reminder_title">Напомняне за Daily Dozen</string>
     <string name="daily_reminder_text">Актуализиране на вашите порции за днес</string>
     <string name="daily_reminder_settings">Настройки за напомняне</string>
@@ -81,17 +81,17 @@
 
     <string-array name="about_text_lines">
         <item>Това приложение е създадено от John Slavick.</item>
-        <item/>
+        <item />
         <item>Използват се следните библиотеки с отворен код: ActiveAndroid, Android-iconify, EventBus, LikeAnimation, и MPAndroidChart.</item>
     </string-array>
 
     <string-array name="backup_instructions_lines">
         <item>Следвайте тези стъпки, за да възстановите Daily Dozen от резервно копие</item>
-        <item/>
+        <item />
         <item>1. Приложението Daily Dozen трябва да се инсталира на вашия телефон с Андроид. Можете да го изтеглите от тук: https://play.google.com/store/apps/details?id=org.nutritionfacts.dailydozen</item>
-        <item/>
+        <item />
         <item>2. Изберете архивния файл, прикачен към този имейл.</item>
-        <item/>
+        <item />
         <item>3. Изберете „Отвори“ с Daily Dozen</item>
     </string-array>
 
@@ -480,11 +480,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -494,12 +494,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ чаша</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 грам</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -508,13 +508,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -528,16 +528,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ чаша</item>
         <item>1 чаша</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 чаши</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 грам</item>
         <item>50 грам</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 грам</item>
     </string-array>
 
@@ -559,13 +559,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">Връзката не може да се отвори. Моля, инсталирайте браузър.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b7e9d256..9eba11f9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -79,7 +79,7 @@
     <string name="units">Einheiten</string>
     <string name="imperial">Englisch</string>
     <string name="metric">Metrisch</string>
-    
+
     <string-array name="about_text_lines">
         <item>Diese Anwendung wurde von John Slavick erstellt.</item>
         <item />
@@ -113,264 +113,264 @@
 
     <string-array name="food_info_types_beans">
         <item>Schwarze Bohnen</item>
-        <item>Schwarze-Augen-Bohnen</item>
-        <item>Butterbohnen</item>
-        <item>Cannellini</item>
-        <item>Kichererbsen</item>
-        <item>Edamame</item>
-        <item>Englische Erbsen</item>
-        <item>Great Northern Bohnen</item>
-        <item>Kidney-Bohnen</item>
-        <item>Linsen (Beluga, französisch, oder rote Sorten)</item>
-        <item>Miso</item>
-        <item>Navy-Bohnen</item>
-        <item>Pintobohnen</item>
-        <item>Kleine rote Bohnen</item>
-        <item>Spalterbsen (gelb oder grün)</item>
-        <item>Tempeh</item>
+        <item>Schwarze-Augen-Bohnen</item>
+        <item>Butterbohnen</item>
+        <item>Cannellini</item>
+        <item>Kichererbsen</item>
+        <item>Edamame</item>
+        <item>Englische Erbsen</item>
+        <item>Great Northern Bohnen</item>
+        <item>Kidney-Bohnen</item>
+        <item>Linsen (Beluga, französisch, oder rote Sorten)</item>
+        <item>Miso</item>
+        <item>Navy-Bohnen</item>
+        <item>Pintobohnen</item>
+        <item>Kleine rote Bohnen</item>
+        <item>Spalterbsen (gelb oder grün)</item>
+        <item>Tempeh</item>
     </string-array>
 
     <string-array name="food_info_types_berries">
         <item>Acai Beeren</item>
-        <item>Berberitzen</item>
-        <item>Brombeeren</item>
-        <item>Heidelbeeren</item>
-        <item>Kirschen oder Weichseln</item>
-        <item>Concord-Trauben</item>
-        <item>Cranberries</item>
-        <item>Goji-Beeren</item>
-        <item>Kumquats</item>
+        <item>Berberitzen</item>
+        <item>Brombeeren</item>
+        <item>Heidelbeeren</item>
+        <item>Kirschen oder Weichseln</item>
+        <item>Concord-Trauben</item>
+        <item>Cranberries</item>
+        <item>Goji-Beeren</item>
+        <item>Kumquats</item>
         <item>Maulbeeren</item>
         <item>Himbeeren (schwarz oder rot)</item>
         <item>Erdbeeren</item>
     </string-array>
-    
+
     <string-array name="food_info_types_other_fruits">
         <item>Äpfel</item>
-        <item>Getrocknete Aprikosen</item>
-        <item>Avocados</item>
-        <item>Bananen</item>
-        <item>Cantaloup-Melone</item>
-        <item>Clementinen</item>
-        <item>Datteln</item>
-        <item>Getrocknete Feigen</item>
-        <item>Grapefruit</item>
-        <item>Honigtau</item>
-        <item>Kiwi</item>
-        <item>Zitronen</item>
+        <item>Getrocknete Aprikosen</item>
+        <item>Avocados</item>
+        <item>Bananen</item>
+        <item>Cantaloup-Melone</item>
+        <item>Clementinen</item>
+        <item>Datteln</item>
+        <item>Getrocknete Feigen</item>
+        <item>Grapefruit</item>
+        <item>Honigtau</item>
+        <item>Kiwi</item>
+        <item>Zitronen</item>
         <item>Limette</item>
-        <item>Lychees</item>
-        <item>Mangos</item>
-        <item>Nektarinen</item>
-        <item>Orangen</item>
-        <item>Papaya</item>
-        <item>Passionsfrucht</item>
-        <item>Pfirsiche</item>
-        <item>Birnen</item>
-        <item>Ananas</item>
-        <item>Pflaumen (vor allem schwarze Pflaumen)</item>
-        <item>Pluots</item>
-        <item>Granatäpfel</item>
-        <item>Backpflaumen</item>
-        <item>Mandarinen</item>
-        <item>Wassermelone</item>
-    </string-array>
-    
+        <item>Lychees</item>
+        <item>Mangos</item>
+        <item>Nektarinen</item>
+        <item>Orangen</item>
+        <item>Papaya</item>
+        <item>Passionsfrucht</item>
+        <item>Pfirsiche</item>
+        <item>Birnen</item>
+        <item>Ananas</item>
+        <item>Pflaumen (vor allem schwarze Pflaumen)</item>
+        <item>Pluots</item>
+        <item>Granatäpfel</item>
+        <item>Backpflaumen</item>
+        <item>Mandarinen</item>
+        <item>Wassermelone</item>
+    </string-array>
+
     <string-array name="food_info_types_cruciferous_vegetables">
-         <item>Rucola</item>
-         <item>Pak Choi</item>
-         <item>Brokkoli (und Romanesco)</item>
-         <item>Rosenkohl</item>
-         <item>Kohl (grün und rot, wirsingkohl)</item>
-         <item>Blumenkohl (weiß, grün, orange, lila)</item>
-         <item>Blattkohl</item>
-         <item>Meerrettich</item>
-         <item>Kohl (schwarz, grün und rot)</item>
+        <item>Rucola</item>
+        <item>Pak Choi</item>
+        <item>Brokkoli (und Romanesco)</item>
+        <item>Rosenkohl</item>
+        <item>Kohl (grün und rot, wirsingkohl)</item>
+        <item>Blumenkohl (weiß, grün, orange, lila)</item>
+        <item>Blattkohl</item>
+        <item>Meerrettich</item>
+        <item>Kohl (schwarz, grün und rot)</item>
         <item>Kohlrabi (grün und lila)</item>
-         <item>Senfkörner</item>
-         <item>Radieschen</item>
-         <item>Kohlrabi</item>
-         <item>Kresse</item>
+        <item>Senfkörner</item>
+        <item>Radieschen</item>
+        <item>Kohlrabi</item>
+        <item>Kresse</item>
     </string-array>
-    
+
     <string-array name="food_info_types_greens">
         <item>Rucola</item>
-        <item>Rüben</item>
-        <item>Blattkohl</item>
-        <item>Kohl (schwarz, grün und rot)</item>
-        <item>Mesclun-Mix (gemischte junge Blattsalate)</item>
-        <item>Senfkörner</item> 
-        <item>Sauerampfer</item>
-        <item>Spinat</item>
-        <item>Mangold</item>
-        <item>Kohlrabi</item>
-    </string-array>
-    
+        <item>Rüben</item>
+        <item>Blattkohl</item>
+        <item>Kohl (schwarz, grün und rot)</item>
+        <item>Mesclun-Mix (gemischte junge Blattsalate)</item>
+        <item>Senfkörner</item>
+        <item>Sauerampfer</item>
+        <item>Spinat</item>
+        <item>Mangold</item>
+        <item>Kohlrabi</item>
+    </string-array>
+
     <string-array name="food_info_types_other_vegetables">
         <item>Artischocken</item>
-        <item>Spargel</item>
-        <item>Rüben</item>
-        <item>Paprika</item>
-        <item>Möhren</item>
-        <item>Mais</item>
-        <item>Knoblauch</item>
-        <item>Pilze (Champignon, Austern-, Portobello- oder Shiitakepilze)</item>
-        <item>Okra</item>
-        <item>Zwiebeln</item>
-        <item>Lila Kartoffeln</item>
-        <item>Kürbis</item>
-        <item>Algen (Arame, Rotalgen oder Nori)</item>
-        <item>Knackerbsen</item> 
-        <item>Kürbis (Delicata, Sommer- und Spaghettikürbis-Sorten)</item>
-        <item>Süßkartoffeln / Yams</item>
-        <item>Tomaten</item>
-        <item>Zucchini</item>
-    </string-array>
-    
+        <item>Spargel</item>
+        <item>Rüben</item>
+        <item>Paprika</item>
+        <item>Möhren</item>
+        <item>Mais</item>
+        <item>Knoblauch</item>
+        <item>Pilze (Champignon, Austern-, Portobello- oder Shiitakepilze)</item>
+        <item>Okra</item>
+        <item>Zwiebeln</item>
+        <item>Lila Kartoffeln</item>
+        <item>Kürbis</item>
+        <item>Algen (Arame, Rotalgen oder Nori)</item>
+        <item>Knackerbsen</item>
+        <item>Kürbis (Delicata, Sommer- und Spaghettikürbis-Sorten)</item>
+        <item>Süßkartoffeln / Yams</item>
+        <item>Tomaten</item>
+        <item>Zucchini</item>
+    </string-array>
+
     <string-array name="food_info_types_flaxseeds">
         <item>Braune Leinsamen</item>
         <item>Goldleinsamen</item>
     </string-array>
-    
+
     <string-array name="food_info_types_nuts">
         <item>Mandeln</item>
-        <item>Paranüsse</item>
-        <item>Cashewkerne</item>
-        <item>Chia-Samen</item>
-        <item>Haselnüsse</item>
-        <item>Hanfsamen</item>
-        <item>Macadamianüsse</item>
-        <item>Pecannüsse</item>
-        <item>Pistazien</item>
-        <item>Kürbiskerne</item>
-        <item>Sesamsamen</item>
-        <item>Sonnenblumenkerne</item>
-        <item>Walnüsse</item>
-    </string-array>
-    
+        <item>Paranüsse</item>
+        <item>Cashewkerne</item>
+        <item>Chia-Samen</item>
+        <item>Haselnüsse</item>
+        <item>Hanfsamen</item>
+        <item>Macadamianüsse</item>
+        <item>Pecannüsse</item>
+        <item>Pistazien</item>
+        <item>Kürbiskerne</item>
+        <item>Sesamsamen</item>
+        <item>Sonnenblumenkerne</item>
+        <item>Walnüsse</item>
+    </string-array>
+
     <string-array name="food_info_types_spices">
         <item>Piment (Nelkenpfeffer)</item>
-        <item>Berberitzen</item>
-        <item>Basilikum</item>
-        <item>Lorbeerblätter</item>
-        <item>Kardamom</item>
-        <item>Chili-Pulver</item>
-        <item>Cilantro</item>
-        <item>Zimt</item>
-        <item>Gewürznelken</item>
-        <item>Koriander</item>
-        <item>Kreuzkümmel</item>
-        <item>Curry-Pulver</item>
-        <item>Dill</item>
-        <item>Bockshornklee</item>
-        <item>Knoblauch</item>
-        <item>Ingwer</item>
-        <item>Meerrettich</item>
-        <item>Zitronengras</item>
-        <item>Majoran</item>
-        <item>Senfpulver</item>
-        <item>Muskatnuss</item>
-        <item>Oregano</item>
-        <item>Geräucherte Paprika</item>
-        <item>Petersilie</item>
-        <item>Pfeffer</item>
-        <item>Pfefferminze</item>
-        <item>Rosmarin</item>
-        <item>Safran</item>
-        <item>Salbei</item>
-        <item>Thymian</item>
-        <item>Kurkuma</item>
-        <item>Vanille</item>
-    </string-array>
-    
+        <item>Berberitzen</item>
+        <item>Basilikum</item>
+        <item>Lorbeerblätter</item>
+        <item>Kardamom</item>
+        <item>Chili-Pulver</item>
+        <item>Cilantro</item>
+        <item>Zimt</item>
+        <item>Gewürznelken</item>
+        <item>Koriander</item>
+        <item>Kreuzkümmel</item>
+        <item>Curry-Pulver</item>
+        <item>Dill</item>
+        <item>Bockshornklee</item>
+        <item>Knoblauch</item>
+        <item>Ingwer</item>
+        <item>Meerrettich</item>
+        <item>Zitronengras</item>
+        <item>Majoran</item>
+        <item>Senfpulver</item>
+        <item>Muskatnuss</item>
+        <item>Oregano</item>
+        <item>Geräucherte Paprika</item>
+        <item>Petersilie</item>
+        <item>Pfeffer</item>
+        <item>Pfefferminze</item>
+        <item>Rosmarin</item>
+        <item>Safran</item>
+        <item>Salbei</item>
+        <item>Thymian</item>
+        <item>Kurkuma</item>
+        <item>Vanille</item>
+    </string-array>
+
     <string-array name="food_info_types_whole_grains">
         <item>Gerste</item>
-        <item>Buchweizen</item>
-        <item>Hirse</item>
-        <item>Hafer</item>
-        <item>Popcorn</item>
-        <item>Andenhirse</item>
-        <item>Roggen</item>
-        <item>Teff</item>
-        <item>Vollkornnudeln</item>
-    </string-array>
-    
+        <item>Buchweizen</item>
+        <item>Hirse</item>
+        <item>Hafer</item>
+        <item>Popcorn</item>
+        <item>Andenhirse</item>
+        <item>Roggen</item>
+        <item>Teff</item>
+        <item>Vollkornnudeln</item>
+    </string-array>
+
     <string-array name="food_info_types_beverages">
         <item>Schwarzer Tee</item>
-        <item>Chai-Tee</item>
-        <item>Kamillentee</item>
-        <item>Kaffee</item>
-        <item>Earl-Grey-Tee</item>
-        <item>Grüner Tee</item>
-        <item>Hibiskustee</item>
-        <item>Heiße Schokolade</item>
-        <item>Jasmintee</item>
-        <item>Zitronenmelisse-Tee</item>
-        <item>Matcha-Tee</item>
-        <item>Mandelblüte Oolong-Tee</item>
-        <item>Pfefferminztee</item>
-        <item>Roibuschtee</item>
-        <item>Wasser</item>
-        <item>Weißer Tee</item>
-    </string-array>
-    
+        <item>Chai-Tee</item>
+        <item>Kamillentee</item>
+        <item>Kaffee</item>
+        <item>Earl-Grey-Tee</item>
+        <item>Grüner Tee</item>
+        <item>Hibiskustee</item>
+        <item>Heiße Schokolade</item>
+        <item>Jasmintee</item>
+        <item>Zitronenmelisse-Tee</item>
+        <item>Matcha-Tee</item>
+        <item>Mandelblüte Oolong-Tee</item>
+        <item>Pfefferminztee</item>
+        <item>Roibuschtee</item>
+        <item>Wasser</item>
+        <item>Weißer Tee</item>
+    </string-array>
+
     <string-array name="food_info_types_exercise">
         <item>Radfahren</item>
-        <item>Kanusport</item>
-        <item>Tanzen</item>
-        <item>Völkerball</item>
-        <item>Abfahrtslauf</item>
-        <item>Fechten</item>
-        <item>Wandern</item>
-        <item>Hausarbeit</item>
-        <item>Eislaufen</item>
-        <item>Inlineskating</item>
-        <item>Jonglieren</item>
-        <item>Trampolinspringen</item>
-        <item>Paddelboot fahren</item>
-        <item>Frisbee spielen</item>
-        <item>Rollschuhlaufen</item>
-        <item>Korbwerfen</item>
-        <item>Schneeschaufeln (leichter Schneefall)</item>
-        <item>Skateboardfahren</item>
-        <item>Schnorcheln</item>
-        <item>Surfen</item>
-        <item>Schwimmen (entspannt)</item>
-        <item>Tennis (Doppel)</item>
-        <item>Wassertreten</item>
-        <item>Rasches Gehen (6 km/h)</item>
-        <item>Wassergymnastik</item>
-        <item>Wasserski</item>
-        <item>Gartenarbeit</item>
-        <item>Yoga</item>
-        <item>Backpacking</item>
-        <item>Basketball</item>
-        <item>Radfahren (bergauf)</item>
-        <item>Zirkeltraining</item>
-        <item>Skilanglauf</item>
-        <item>Fußball</item>
-        <item>Eishockey</item>
-        <item>Jogging</item>
-        <item>Hampelmann (Gymnastik)</item>
-        <item>Seilspringen</item>
-        <item>Lacrosse</item>
-        <item>Liegestütze</item>
-        <item>Klimmzüge</item>
-        <item>Racquetball</item>
-        <item>Felsklettern</item>
-        <item>Rugby</item>
-        <item>Laufen</item>
-        <item>Gerätetauchen</item>
-        <item>Tennis (Einzel)</item>
-        <item>Fußball</item>
-        <item>Eisschnelllauf</item>
-        <item>Squash</item>
-        <item>Step-Aerobic</item>
-        <item>Schwimmen (Runden)</item>
-        <item>Flottes Bergaufgehen</item>
-        <item>Wasserjogging</item>
-    </string-array>
-    
+        <item>Kanusport</item>
+        <item>Tanzen</item>
+        <item>Völkerball</item>
+        <item>Abfahrtslauf</item>
+        <item>Fechten</item>
+        <item>Wandern</item>
+        <item>Hausarbeit</item>
+        <item>Eislaufen</item>
+        <item>Inlineskating</item>
+        <item>Jonglieren</item>
+        <item>Trampolinspringen</item>
+        <item>Paddelboot fahren</item>
+        <item>Frisbee spielen</item>
+        <item>Rollschuhlaufen</item>
+        <item>Korbwerfen</item>
+        <item>Schneeschaufeln (leichter Schneefall)</item>
+        <item>Skateboardfahren</item>
+        <item>Schnorcheln</item>
+        <item>Surfen</item>
+        <item>Schwimmen (entspannt)</item>
+        <item>Tennis (Doppel)</item>
+        <item>Wassertreten</item>
+        <item>Rasches Gehen (6 km/h)</item>
+        <item>Wassergymnastik</item>
+        <item>Wasserski</item>
+        <item>Gartenarbeit</item>
+        <item>Yoga</item>
+        <item>Backpacking</item>
+        <item>Basketball</item>
+        <item>Radfahren (bergauf)</item>
+        <item>Zirkeltraining</item>
+        <item>Skilanglauf</item>
+        <item>Fußball</item>
+        <item>Eishockey</item>
+        <item>Jogging</item>
+        <item>Hampelmann (Gymnastik)</item>
+        <item>Seilspringen</item>
+        <item>Lacrosse</item>
+        <item>Liegestütze</item>
+        <item>Klimmzüge</item>
+        <item>Racquetball</item>
+        <item>Felsklettern</item>
+        <item>Rugby</item>
+        <item>Laufen</item>
+        <item>Gerätetauchen</item>
+        <item>Tennis (Einzel)</item>
+        <item>Fußball</item>
+        <item>Eisschnelllauf</item>
+        <item>Squash</item>
+        <item>Step-Aerobic</item>
+        <item>Schwimmen (Runden)</item>
+        <item>Flottes Bergaufgehen</item>
+        <item>Wasserjogging</item>
+    </string-array>
+
     <string-array name="food_info_serving_sizes_beans">
         <item>%s Hummus oder Bohnendip</item>
         <item>%s gekochte Bohnen, Erbsen, Linsen, Tofu oder Tempeh</item>
@@ -388,7 +388,7 @@
         <item>130 g</item>
         <item>150 g</item>
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_berries">
         <item>%s frisch oder gefroren</item>
         <item>%s getrocknet</item>
@@ -411,13 +411,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 Tasse</item>
         <item>¼ Tasse</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 g</item>
         <item>60 g</item>
     </string-array>
@@ -431,15 +431,15 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ Tasse</item>
         <item>¼ Tasse</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g</item>
         <item>12 g</item>
-        <item/>
+        <item />
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_greens">
         <item>%s roh</item>
         <item>%s gekocht</item>
@@ -454,7 +454,7 @@
         <item>60 g</item>
         <item>90 g</item>
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_other_vegetables">
         <item>%s rohes Blattgemüse</item>
         <item>%s roh oder gekocht; kein Blattgemüse</item>
@@ -475,19 +475,19 @@
         <item>125 ml</item>
         <item>7 g</item>
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_flaxseeds">
         <item>%s1 Esslöffel (15 ml) gerieben</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_nuts">
         <item>%s Nüsse oder Samen</item>
         <item>%s2 Esslöffel (30 ml) Butter aus Nüssen oder Samen</item>
@@ -495,29 +495,29 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ Tasse</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 g</item>
-        <item/>
+        <item />
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_spices">
         <item>%s¼ Teelöffel (1,2 ml) Kurkuma</item>
         <item>%sAlle anderen (salzfreien) Kräuter und Gewürze, die du magst</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_whole_grains">
         <item>%s heißes oder gekochtes Getreide, Teigwaren, oder Maiskörner</item>
         <item>%s Getreide</item>
@@ -529,19 +529,19 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ Tasse</item>
         <item>1 Tasse</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 Tassen</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 g</item>
         <item>50 g</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 g</item>
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_beverages">
         <item>1½ Gläser (%s)</item>
     </string-array>
@@ -553,20 +553,20 @@
     <string-array name="food_info_serving_sizes_beverages_metric">
         <item>350 ml</item>
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_exercise">
         <item>%s90 min Aktivität mittlerer Intensität</item>
         <item>%s40 min Aktivität hoher Intensität</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
     <string name="channel_reminders_name">Erinnerungen</string>
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e158aee2..1d6e7f74 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -67,8 +67,8 @@
     <string name="dialog_ask_user_to_rate_app_message">Παρακαλώ δώστε μας τα σχόλιά στο Play Store.</string>
     <string name="rate_now">Αποστολή σχολίων</string>
     <string name="not_now">Όχι τώρα</string>
-    <string formatted="false" name="format_version">εκδοχή %s</string>
-    <string formatted="false" name="format_num_days">%d ημέρες</string>
+    <string name="format_version" formatted="false">εκδοχή %s</string>
+    <string name="format_num_days" formatted="false">%d ημέρες</string>
     <string name="daily_reminder_title">Υπενθύμιση Daily Dozen</string>
     <string name="daily_reminder_text">Ενημερώστε τις μερίδες σας για σήμερα</string>
     <string name="daily_reminder_settings">Ρυθμίσεις Καθημερινής Υπενθύμισης</string>
@@ -81,17 +81,17 @@
 
     <string-array name="about_text_lines">
         <item>Η εφαρμογή δημιουργήθηκε από τον John Slavick.</item>
-        <item/>
+        <item />
         <item>Χρησιμοποιούνται οι ακόλουθες βιβλιοθήκες ανοικτού κώδικα: ActiveAndroid, android-iconify, EventBus, LikeAnimation και MPAndroidChart.</item>
     </string-array>
 
     <string-array name="backup_instructions_lines">
         <item>Ακολουθήστε τα παρακάτω βήματα για να επαναφέρετε αυτό το αντίγραφο ασφαλείας στην εφαρμογή Daily Dozen</item>
-        <item/>
+        <item />
         <item>1. Η εφαρμογή Daily Dozen πρέπει να εγκατασταθεί στο Android κινητό σας τηλέφωνο. Μπορείτε να τη κατεβάσετε από εδώ: https://play.google.com/store/apps/details?id=org.nutritionfacts.dailydozen</item>
-        <item/>
+        <item />
         <item>2. Πατήστε στο αρχείο αντιγράφου ασφαλείας που επισυνάπτεται σε αυτό το email.</item>
-        <item/>
+        <item />
         <item>3. Επιλέξτε Άνοιγμα με Daily Dozen</item>
     </string-array>
 
@@ -410,13 +410,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 φλυτζάνι</item>
         <item>¼ φλιτζάνι</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 γραμμάρια</item>
         <item>40 γραμμάρια</item>
     </string-array>
@@ -430,13 +430,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ φλιτζάνι</item>
         <item>¼ φλιτζάνι</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 γραμμάρια</item>
         <item>12 γραμμάρια</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens">
@@ -480,11 +480,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -494,12 +494,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ φλιτζάνι</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 γραμμάρια</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -508,13 +508,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -528,16 +528,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ φλιτζάνι</item>
         <item>1 φλιτζάνι</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 φλιτζάνια</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 γραμμάρια</item>
         <item>50 γραμμάρια</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 γραμμάρια</item>
     </string-array>
 
@@ -559,13 +559,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">Δεν ήταν δυνατό το άνοιγμα url. Παρακαλώ εγκαταστήστε ένα πρόγραμμα περιήγησης.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 618449f2..c238e50f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -509,12 +509,12 @@
 
     <string-array name="food_info_serving_sizes_spices_imperial">
         <item>¼ cucharadita</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
         <item>¼ cucharadita</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -585,7 +585,7 @@
     <string name="tweak_group_dailydoses">Toma la dosis diaria</string>
     <string name="tweak_group_nightly">Cada noche</string>
     <string name="about_tweak">Sobre este potenciador</string>
-    
+
     <string name="meal_water">Empezar con agua</string>
     <string name="meal_negcal">Empezar con alimentos de calorías negativas"</string>
     <string name="meal_vinegar">Vinagre (2 ctda. cada comida)</string>
@@ -607,10 +607,10 @@
     <string name="nightly_fast">Ayuno después de las 7 P.M.</string>
     <string name="nightly_sleep">Dormir lo suficiente</string>
     <string name="nightly_trendelenburg">Trendelenburg</string>
-    
+
     <string name="debug_generate_weight_data">Generar datos de peso</string>
     <string name="average_weight_on_day">Peso promedio en el día</string>
-    
+
     <string name="meal_water_short">Empezar con agua</string>
     <string name="meal_negcal_short">Empezar con alimentos de calorías negativas</string>
     <string name="meal_vinegar_short">Vinagre (2 ctda. cada comida)</string>
@@ -632,7 +632,7 @@
     <string name="nightly_fast_short">Ayuno después de las 7 P.M.</string>
     <string name="nightly_sleep_short">Dormir lo suficiente</string>
     <string name="nightly_trendelenburg_short">Trendelenburg</string>
-    
+
     <string name="meal_water_text">Toma dos tazas de agua sin sabor, fría o del tiempo, antes de cada comida para acelerar tu metabolismo y aprovechar sus beneficios.</string>
     <string name="meal_negcal_text">Como entrante, puedes comerte una manzana, una sopa o una ensalada con alimentos de luz verde que contenga menos de cien calorías por taza.</string>
     <string name="meal_vinegar_text">Nunca bebas vinagre solo. Puedes usarlo para condimentar las comidas o aderezar una ensalada. Puedes usar cualquier tipo de vinagre, dulce o salado. Si quieres beberlo, debes mezclarlo con un vaso de agua y enjuagarte la boca justo después para proteger el esmalte dental.</string>
@@ -654,5 +654,5 @@
     <string name="nightly_fast_text">Debido a la influencia de los ritmos circadianos, lo que comes por la noche engorda más que si comieras eso mismo pero más temprano en el día, así que intenta ayunar todas las noches durante al menos doce horas a partir de las 7 P.M. Cuantas menos calorías consumas después de que se ponga el sol, mejor.</string>
     <string name="nightly_sleep_text">Puedes marcar esta casilla si has dormido al menos siete horas y te has ido a la cama a tu hora normal.</string>
     <string name="nightly_trendelenburg_text">Prueba a estar al menos cuatro horas cada noche con el cuerpo inclinado seis grados. Para conseguirlo, debes elevar los postes del pie de la cama unos 20 centímetros. Ten mucho cuidado al levantarte, ya que esta postura causa intolerancia ortostática para casi todo el mundo, aunque seas joven y estés saludable, así que, si te levantas demasiado rápido, puedes marearte, desmayarte o incluso caerte y hacerte daño. Por lo tanto, levántate lentamente. Beber dos tazas de agua fría treinta minutos antes de levantarte también podría ayudar a prevenir este efecto secundario potencialmente peligroso.\n\nIMPORTANTE: no intentes esto en casa si tienes problemas cardiacos o pulmonares, reflujo ácido, problemas cerebrales (como traumatismo craneal) u oculares (incluso un historial familiar de glaucoma lo descalifica). Si tienes cualquier duda, no lo intentes sin preguntarle a tu médico antes.*</string>
-    
+
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a28db280..687c2414 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -411,13 +411,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 tasse</item>
         <item>¼ tasse</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 g</item>
         <item>40 g</item>
     </string-array>
@@ -431,13 +431,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ tasse</item>
         <item>¼ tasse</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g</item>
         <item>12 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens">
@@ -481,11 +481,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -495,12 +495,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ tasse</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -509,13 +509,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -529,16 +529,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ tasse</item>
         <item>1 tasse</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 tasses</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 g</item>
         <item>50 g</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 g</item>
     </string-array>
 
@@ -560,13 +560,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">Impossible d\'ouvrir l\'url. Veuillez installer un navigateur.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e9c8318b..ba830c28 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -427,13 +427,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 tazza</item>
         <item>¼ tazza</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 g</item>
         <item>40 g</item>
     </string-array>
@@ -447,13 +447,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ tazza</item>
         <item>¼ tazza</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g</item>
         <item>12 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens">
@@ -497,11 +497,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -511,12 +511,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ tazza</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -525,13 +525,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -545,16 +545,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ tazza</item>
         <item>1 tazza</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 tazze</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 g</item>
         <item>50 g</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 g</item>
     </string-array>
 
@@ -576,13 +576,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">Impossibile aprire URL. Si prega di installare un browser.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8f64550f..6ea18798 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,4 +1,3 @@
-
 <resources>
     <string name="app_name">Codzienny Tuzin</string>
     <string name="beans">Rośliny strączkowe</string>
@@ -177,16 +176,16 @@
     </integer-array>
     <string-array name="about_text_lines">
         <item>This app was created by John Slavick.</item>
-        <item/>
+        <item />
         <item>The following open source libraries are used: ActiveAndroid, android-iconify, EventBus, LikeAnimation, and MPAndroidChart.</item>
     </string-array>
     <string-array name="backup_instructions_lines">
         <item>Wykonaj następujące kroki, aby przywrócić swoją kopię zapasową w aplikacji Codzienny Tuzin.</item>
-        <item></item>
+        <item />
         <item>1. Aplikacja Codzienny Tuzin musi być zainstalowana na telefonie z systemem Android. Możesz ją pobrać tutaj: : https://play.google.com/store/apps/details?id=org.nutritionfacts.dailydozen</item>
-        <item></item>
+        <item />
         <item>2. Stuknij w plik kopii zapasowej załączony w tym e-mailu.</item>
-        <item></item>
+        <item />
         <item>3. Wybierz opcję „Otwórz przy pomocy Codzienny Tuzin”.</item>
     </string-array>
     <string-array name="servings_time_scale_choices">
@@ -483,12 +482,12 @@
         <item>%s suszonych owoców</item>
     </string-array>
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item></item>
+        <item />
         <item> szklanka</item>
         <item>¼ szklanki</item>
     </string-array>
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item></item>
+        <item />
         <item>20 g</item>
         <item>40 g</item>
     </string-array>
@@ -500,12 +499,12 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ szklanki</item>
         <item>¼ szklanki</item>
-        <item></item>
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g</item>
         <item>12 g</item>
-        <item></item>
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_greens">
         <item>%s surowych</item>
@@ -541,10 +540,10 @@
         <item>%s1 łyżka mielonych</item>
     </string-array>
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item></item>
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item></item>
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_nuts">
         <item>%s orzechów lub nasion</item>
@@ -552,23 +551,23 @@
     </string-array>
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ szklanki</item>
-        <item></item>
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 g</item>
-        <item></item>
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_spices">
         <item>%s¼ łyżeczki kurkumy</item>
         <item>%sWszelkie inne (pozbawione soli) zioła i przyprawy, które lubisz</item>
     </string-array>
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item></item>
-        <item></item>
+        <item />
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item></item>
-        <item></item>
+        <item />
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_whole_grains">
         <item>%s gorących płatków zbożowych lub gotowanych ziaren, makaronu lub ziaren kukurydzy</item>
@@ -580,15 +579,15 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ szklanki</item>
         <item>1 szklanka</item>
-        <item></item>
-        <item></item>
+        <item />
+        <item />
         <item> szklanki</item>
     </string-array>
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 g</item>
         <item>50 g</item>
-        <item></item>
-        <item></item>
+        <item />
+        <item />
         <item>0 g</item>
     </string-array>
     <string-array name="food_info_serving_sizes_beverages">
@@ -605,11 +604,11 @@
         <item>%s40 minut intensywnej aktywności</item>
     </string-array>
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item></item>
-        <item></item>
+        <item />
+        <item />
     </string-array>
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item></item>
-        <item></item>
+        <item />
+        <item />
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 7c127e91..24e1ff38 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -509,12 +509,12 @@
 
     <string-array name="food_info_serving_sizes_spices_imperial">
         <item>¼ colher de chá</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
         <item>¼ colher de chá</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 56242ef0..29404725 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -428,13 +428,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 cană</item>
         <item>¼ cană</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 g</item>
         <item>40 g</item>
     </string-array>
@@ -448,13 +448,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ cană</item>
         <item>¼ cană</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g</item>
         <item>12 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens">
@@ -498,11 +498,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -512,12 +512,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ cup</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -526,13 +526,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -546,16 +546,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ cup</item>
         <item>1 cup</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 cups</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 g</item>
         <item>50 g</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 g</item>
     </string-array>
 
@@ -577,13 +577,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">Nu s-a putut deschide adresa URL. Vă rugăm să instalați un browser.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1795b74a..f2f2d1f3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -428,13 +428,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 чашка</item>
         <item>¼ чашки</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 г</item>
         <item>40 г</item>
     </string-array>
@@ -448,13 +448,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ чашки</item>
         <item>¼ чашки</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 г</item>
         <item>12 г</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens">
@@ -498,11 +498,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -512,12 +512,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ чашки</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 г</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -526,13 +526,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -546,16 +546,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ чашки</item>
         <item>1 чашка</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 чашки</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 г</item>
         <item>50 г</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 г</item>
     </string-array>
 
@@ -577,13 +577,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">Не могу открыть ссылку. Пожалуйста, установите браузер.</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 8ff88115..2231d477 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -409,7 +409,7 @@
         <item>½杯新鮮或冷凍莓果</item>
         <item>¼杯莓果乾</item>
     </string-array>
-    
+
     <string-array name="food_info_serving_sizes_berries_imperial">
         <item>½杯</item>
         <item>¼杯</item>
@@ -427,13 +427,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1杯</item>
         <item>¼杯</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120克</item>
         <item>40克</item>
     </string-array>
@@ -459,13 +459,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½杯</item>
         <item>¼杯</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80克</item>
         <item>12克</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens_imperial">
@@ -497,11 +497,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -511,12 +511,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼杯</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30克</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -525,13 +525,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -545,16 +545,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½杯</item>
         <item>1杯</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3杯</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100克</item>
         <item>50克</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30克</item>
     </string-array>
 
@@ -576,13 +576,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string name="error_cannot_handle_url">無法開啟網頁。請安裝瀏覽器。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83188bc4..34304f41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -682,13 +682,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_imperial">
-        <item/>
+        <item />
         <item>1 cup</item>
         <item>¼ cup</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_other_fruits_metric">
-        <item/>
+        <item />
         <item>120 g</item>
         <item>40 g</item>
     </string-array>
@@ -702,13 +702,13 @@
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_imperial">
         <item>½ cup</item>
         <item>¼ cup</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_cruciferous_vegetables_metric">
         <item>30–80 g</item>
         <item>12 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_greens">
@@ -752,11 +752,11 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_imperial">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_flaxseeds_metric">
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts">
@@ -766,12 +766,12 @@
 
     <string-array name="food_info_serving_sizes_nuts_imperial">
         <item>¼ cup</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_nuts_metric">
         <item>30 g</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices">
@@ -780,13 +780,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_spices_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains">
@@ -800,16 +800,16 @@
     <string-array name="food_info_serving_sizes_whole_grains_imperial">
         <item>½ cup</item>
         <item>1 cup</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>3 cups</item>
     </string-array>
 
     <string-array name="food_info_serving_sizes_whole_grains_metric">
         <item>100 g</item>
         <item>50 g</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>30 g</item>
     </string-array>
 
@@ -831,13 +831,13 @@
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_imperial">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <string-array name="food_info_serving_sizes_exercise_metric">
-        <item/>
-        <item/>
+        <item />
+        <item />
     </string-array>
 
     <!--
@@ -849,19 +849,19 @@
 
     <string-array name="food_videos_beans" translatable="false">
         <item>black-beans</item>
-        <item/>
-        <item/>
-        <item/>
+        <item />
+        <item />
+        <item />
         <item>chickpeas</item>
         <item>edamame</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>kidney-beans</item>
         <item>lentils</item>
         <item>miso</item>
         <item>navy-beans</item>
         <item>pinto-beans</item>
-        <item/>
+        <item />
         <item>split-peas</item>
         <item>tempeh</item>
     </string-array>
@@ -872,11 +872,11 @@
         <item>blackberries</item>
         <item>blueberries</item>
         <item>cherries</item>
-        <item>concord-grapes</item>
+        <item>grapes</item>
         <item>cranberries</item>
         <item>goji-berries</item>
-        <item/>
-        <item/>
+        <item />
+        <item />
         <item>raspberries</item>
         <item>strawberries</item>
     </string-array>
@@ -887,59 +887,59 @@
         <item>avocados</item>
         <item>bananas</item>
         <item>cantaloupe</item>
-        <item/>
+        <item />
         <item>dates</item>
-        <item>figs</item>
+        <item />
         <item>grapefruit</item>
-        <item/>
+        <item />
         <item>kiwifruit</item>
         <item>lemons</item>
         <item>limes</item>
-        <item/>
+        <item />
         <item>mango</item>
-        <item/>
+        <item />
         <item>oranges</item>
-        <item>papaya</item>
-        <item/>
+        <item />
+        <item />
         <item>peaches</item>
         <item>pears</item>
-        <item>pineapples</item>
+        <item />
         <item>plums</item>
-        <item/>
+        <item />
         <item>pomegranates</item>
         <item>prunes</item>
-        <item/>
+        <item />
         <item>watermelon</item>
     </string-array>
 
     <string-array name="food_videos_cruciferous_vegetables" translatable="false">
-        <item/>
+        <item />
         <item>bok-choy</item>
         <item>broccoli</item>
         <item>brussels-sprouts</item>
         <item>cabbage</item>
         <item>cauliflower</item>
         <item>collard-greens</item>
-        <item/>
+        <item />
         <item>kale</item>
-        <item>kohlrabi</item>
+        <item />
         <item>mustard-greens</item>
-        <item>radishes</item>
-        <item/>
+        <item />
+        <item />
         <item>watercress</item>
     </string-array>
 
     <string-array name="food_videos_greens" translatable="false">
-        <item/>
-        <item>beet-greens</item>
+        <item />
+        <item>beets</item>
         <item>collard-greens</item>
         <item>kale</item>
-        <item>mesclun-mix</item>
+        <item />
         <item>mustard-greens</item>
-        <item/>
+        <item />
         <item>spinach</item>
         <item>swiss-chard</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_videos_other_vegetables" translatable="false">
@@ -953,10 +953,10 @@
         <item>mushrooms</item>
         <item>okra</item>
         <item>onions</item>
-        <item>purple-potatoes</item>
+        <item>potatoes</item>
         <item>pumpkin</item>
         <item>sea-vegetables</item>
-        <item/>
+        <item />
         <item>squash</item>
         <item>sweet-potatoes</item>
         <item>tomatoes</item>
@@ -969,7 +969,7 @@
         <item>cashews</item>
         <item>chia-seeds</item>
         <item>hazelnuts</item>
-        <item/>
+        <item />
         <item>macadamia-nuts</item>
         <item>pecans</item>
         <item>pistachios</item>
@@ -983,35 +983,35 @@
         <item>allspice</item>
         <item>barberries</item>
         <item>basil</item>
-        <item/>
-        <item>cardamom</item>
-        <item/>
+        <item />
+        <item />
+        <item />
         <item>cilantro</item>
         <item>cinnamon</item>
         <item>cloves</item>
-        <item>coriander</item>
+        <item />
         <item>cumin</item>
         <item>curry-powder</item>
-        <item/>
+        <item />
         <item>fenugreek</item>
         <item>garlic</item>
         <item>ginger</item>
-        <item/>
-        <item>lemongrass</item>
+        <item />
+        <item />
         <item>marjoram</item>
         <item>mustard-powder</item>
         <item>nutmeg</item>
         <item>oregano</item>
-        <item>paprika</item>
+        <item />
         <item>parsley</item>
         <item>pepper</item>
         <item>peppermint</item>
         <item>rosemary</item>
         <item>saffron</item>
-        <item/>
-        <item>thyme</item>
+        <item />
+        <item />
         <item>turmeric</item>
-        <item/>
+        <item />
     </string-array>
 
     <string-array name="food_videos_whole_grains" translatable="false">
@@ -1022,7 +1022,7 @@
         <item>popcorn</item>
         <item>quinoa</item>
         <item>rye</item>
-        <item>teff</item>
+        <item />
         <item>pasta</item>
     </string-array>
 
@@ -1034,12 +1034,12 @@
         <item>earl-grey-tea</item>
         <item>green-tea</item>
         <item>hibiscus-tea</item>
-        <item/>
-        <item>jasmine-tea</item>
+        <item />
+        <item />
         <item>lemon-balm</item>
         <item>matcha</item>
         <item>oolong-tea</item>
-        <item/>
+        <item>peppermint</item>
         <item>rooibos-tea</item>
         <item>water</item>
         <item>white-tea</item>