diff --git a/assets/store_descriptions/ar-SA/strings.xml b/assets/store_descriptions/ar-SA/strings.xml
index 3c08a88d94..cf2121ea22 100644
--- a/assets/store_descriptions/ar-SA/strings.xml
+++ b/assets/store_descriptions/ar-SA/strings.xml
@@ -20,7 +20,7 @@ https://www.openhab.org/addons/</bindings>
     <short_description>تكنولوجيا أتمتة المنزل المفتوحة المصدر والغير مرتبطة بتقنية أو مصنع محدد</short_description>
     <fdroid> </fdroid>
     <fdroid_beta><![CDATA[يمكنك تثبيت الإصدار التجريبي مع <a href="https://f-droid.org/packages/org.openhab.habdroid/">الإصدار المستقر</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>سياسة الخصوصية: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>جرب الميزات الجديدة واعطنا ملاحظاتك!</beta>
     <play_beta>يمكنك تثبيت الإصدار التجريبي بجانب الإصدار المستقر.</play_beta>
     <changelog_play_beta>إصلاح الأخطاء وتحسينات. يرجى زيارة https://github.com/openhab/openhab-android/releases للحصول على سجل تفصيلي.</changelog_play_beta>
diff --git a/assets/store_descriptions/bg-BG/strings.xml b/assets/store_descriptions/bg-BG/strings.xml
index f58c00035e..22370ba347 100644
--- a/assets/store_descriptions/bg-BG/strings.xml
+++ b/assets/store_descriptions/bg-BG/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Cистема за автоматизация на домове обединяваща различни технологии</short_description>
     <fdroid> Вместо това известията се анкетират редовно в тези компилации.</fdroid>
     <fdroid_beta><![CDATA[Може да инсталираш бета версията паралелно със <a href="https://f-droid.org/packages/org.openhab.habdroid/">стабилната версия</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Политика за поверителност: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Опитайте нови функции и дайте ранна обратна връзка!</beta>
     <play_beta>Може да инсталираш бета версията паралелно със стабилната версия.</play_beta>
     <changelog_play_beta>Оправя грешки и подобрява стабилността. Посети https://github.com/openhab/openhab-android/releases за подробно описание на промените.</changelog_play_beta>
diff --git a/assets/store_descriptions/ca-ES/strings.xml b/assets/store_descriptions/ca-ES/strings.xml
index d1b358af67..a61f6bf1e6 100644
--- a/assets/store_descriptions/ca-ES/strings.xml
+++ b/assets/store_descriptions/ca-ES/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Domòtica de codi obert independent de la tecnologia i el fabricant</short_description>
     <fdroid>Les compilacions de F-Droid no tenen FCM ni informes d'error i per tant no poden rebre notificacions instantànies (push) d'openHAB Cloud. En comptes d'això, les notificacions es consulten regularment en aquestes compilacions.</fdroid>
     <fdroid_beta><![CDATA[Podeu instal·lar la versió beta juntament amb la <a href="https://f-droid.org/packages/org.openhab.habdroid/">versió estable</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Política de privadesa: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Proveu funcions noves i feu-ne comentaris abans!</beta>
     <play_beta>Podeu instal·lar la versió beta juntament amb la versió estable.</play_beta>
     <changelog_play_beta>Correccions i millores. Visiteu https://github.com/openhab/openhab-android/releases per obtenir un registre de canvis detallat.</changelog_play_beta>
diff --git a/assets/store_descriptions/cs-CZ/strings.xml b/assets/store_descriptions/cs-CZ/strings.xml
index 2e9ae72a4f..898a2f4914 100644
--- a/assets/store_descriptions/cs-CZ/strings.xml
+++ b/assets/store_descriptions/cs-CZ/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Domácí automatizace pro IoT různých výrobců a technologií</short_description>
     <fdroid>Sestavení F-Droid má FCM odstraněno, a proto nebude moci přijímat push oznámení z openHAB Cloudu. Namísto toho jsou oznámení získávána v pravidelných intervalech.</fdroid>
     <fdroid_beta><![CDATA[Můžete nainstalovat beta verzi vedle <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabilní verze</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Ochrana osobních údajů: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Vyzkoušejte nové funkce a dejte nám zpětnou vazbu!</beta>
     <play_beta>Vedle stabilní verze můžete nainstalovat i beta verzi.</play_beta>
     <changelog_play_beta>Opravy chyb a vylepšení stability. Prosím navštivte https://github.com/openhab/openhab-android/releases pro detailní informace o změnách.</changelog_play_beta>
diff --git a/assets/store_descriptions/de-DE/strings.xml b/assets/store_descriptions/de-DE/strings.xml
index 8afa52f64f..21c3153e0a 100644
--- a/assets/store_descriptions/de-DE/strings.xml
+++ b/assets/store_descriptions/de-DE/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Technologie- und herstellerunabhängige, quelloffene Automatisierungslösung</short_description>
     <fdroid>Bei den Builds auf F-Droid wurde FCM entfernt und daher können keine Push-Benachrichtigungen von openHAB Cloud erhalten werden. Stattdessen werden Benachrichtigungen regelmäßig in diesen Builds abgefragt.</fdroid>
     <fdroid_beta><![CDATA[Sie können die Betaversion neben der <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabilen Version</a> installieren.]]></fdroid_beta>
-    <fdroid_privacy_policy>Datenschutzerklärung: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy>Datenschutzerklärung: https://www.openhabfoundation.org/privacy.html#android-app</fdroid_privacy_policy>
     <beta>Testen Sie neue Features und geben Sie früh Feedback!</beta>
     <play_beta>Sie können die Betaversion neben der stabilen Version installieren.</play_beta>
     <changelog_play_beta>Stabilitätsverbesserungen und Fehlerbehebungen. Bitte besuchen Sie https://github.com/openhab/openhab-android/releases für ein detailliertes Changelog.</changelog_play_beta>
diff --git a/assets/store_descriptions/el-GR/strings.xml b/assets/store_descriptions/el-GR/strings.xml
index 114b17de1f..24a7c8828f 100644
--- a/assets/store_descriptions/el-GR/strings.xml
+++ b/assets/store_descriptions/el-GR/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Ανεξάρτητο τεχνολογίας &amp; κατασκευαστή ανοικτό λογισμικό αυτοματοποίησης σπιτιού</short_description>
     <fdroid> </fdroid>
     <fdroid_beta><![CDATA[Μπορείτε να εγκαταστήσετε την έκδοση beta παράλληλα με την <a href="https://f-droid.org/packages/org.openhab.habdroid/">σταθερή έκδοση</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Πολιτική προστασίας προσωπικών δεδομένων: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Δοκιμάστε νέες δυνατότητες και να δώστε έγκαιρη ανατροφοδότηση!</beta>
     <play_beta>Μπορείτε να εγκαταστήσετε την έκδοση beta παράλληλα με την σταθερή έκδοση.</play_beta>
     <changelog_play_beta> </changelog_play_beta>
diff --git a/assets/store_descriptions/es-ES/strings.xml b/assets/store_descriptions/es-ES/strings.xml
index f436fd8c97..dc8e2b6b0b 100644
--- a/assets/store_descriptions/es-ES/strings.xml
+++ b/assets/store_descriptions/es-ES/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Domótica de código abierto independiente del proveedor y de la tecnología</short_description>
     <fdroid>Las compilaciones en F-Droid han eliminado FCM y por lo tanto no podrán recibir notificaciones push de openHAB Cloud. En su lugar, las notificaciones se comprueban en estas compilaciones de forma regular.</fdroid>
     <fdroid_beta><![CDATA[Puede instalar la versión beta junto a la <a href="https://f-droid.org/packages/org.openhab.habdroid/">versión estable</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Política de privacidad: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>¡Pruebe las nuevas características y repórtenos su experiencia!</beta>
     <play_beta>Puede instalar la versión beta junto a la versión estable.</play_beta>
     <changelog_play_beta>Corrección de errores y mejoras de estabilidad. Por favor visite https://github.com/openhab/openhab-android/releases para un registro de cambios detallado.</changelog_play_beta>
diff --git a/assets/store_descriptions/es-US/strings.xml b/assets/store_descriptions/es-US/strings.xml
index f436fd8c97..dc8e2b6b0b 100644
--- a/assets/store_descriptions/es-US/strings.xml
+++ b/assets/store_descriptions/es-US/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Domótica de código abierto independiente del proveedor y de la tecnología</short_description>
     <fdroid>Las compilaciones en F-Droid han eliminado FCM y por lo tanto no podrán recibir notificaciones push de openHAB Cloud. En su lugar, las notificaciones se comprueban en estas compilaciones de forma regular.</fdroid>
     <fdroid_beta><![CDATA[Puede instalar la versión beta junto a la <a href="https://f-droid.org/packages/org.openhab.habdroid/">versión estable</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Política de privacidad: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>¡Pruebe las nuevas características y repórtenos su experiencia!</beta>
     <play_beta>Puede instalar la versión beta junto a la versión estable.</play_beta>
     <changelog_play_beta>Corrección de errores y mejoras de estabilidad. Por favor visite https://github.com/openhab/openhab-android/releases para un registro de cambios detallado.</changelog_play_beta>
diff --git a/assets/store_descriptions/et-EE/strings.xml b/assets/store_descriptions/et-EE/strings.xml
index dfee8df137..cac0f74384 100644
--- a/assets/store_descriptions/et-EE/strings.xml
+++ b/assets/store_descriptions/et-EE/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Nutika kodu automatiseerimise avatud lähtekoodiga tehnoloogia pakkuja</short_description>
     <fdroid> </fdroid>
     <fdroid_beta><![CDATA[Võite installida beta versiooni paralleelselt <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabiilse versiooniga</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Privaatsuseeskirjad: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Proovige uusi funktsioone ja andke tagasisidet!</beta>
     <play_beta>Võite installida beetaversiooni asemel stabiilse versiooni.</play_beta>
     <changelog_play_beta> </changelog_play_beta>
diff --git a/assets/store_descriptions/fi-FI/strings.xml b/assets/store_descriptions/fi-FI/strings.xml
index 127b75d427..af75f711ef 100644
--- a/assets/store_descriptions/fi-FI/strings.xml
+++ b/assets/store_descriptions/fi-FI/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Toimittaja- ja teknologiariippumatonta avoimen lähdekoodin kotiautomaatiota</short_description>
     <fdroid> </fdroid>
     <fdroid_beta><![CDATA[Voit asentaa beta version <a href="https://f-droid.org/packages/org.openhab.habdroid/">vakaan version</a> rinnalle.]]></fdroid_beta>
-    <fdroid_privacy_policy>Tietosuojakäytäntö: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Kokeilla uusia ominaisuuksia ja anna pian palautetta!</beta>
     <play_beta>Voit asentaa beta version vakaan version rinnalle.</play_beta>
     <changelog_play_beta> Käy osoitteessa https://github.com/openhab/openhab-android/releases saadaksesi yksityiskohtaisen muutoslokin.</changelog_play_beta>
diff --git a/assets/store_descriptions/fr-FR/strings.xml b/assets/store_descriptions/fr-FR/strings.xml
index 33909d0228..3aa46d2773 100644
--- a/assets/store_descriptions/fr-FR/strings.xml
+++ b/assets/store_descriptions/fr-FR/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Solution de domotique open source et agnostique des technologies</short_description>
     <fdroid>Les versions sur F-Droid ont supprimé FCM et ne seront donc pas en mesure de recevoir les notifications push d'openHAB Cloud. Au lieu de cela, les notifications sont régulièrement consultées dans ces versions.</fdroid>
     <fdroid_beta><![CDATA[Vous pouvez installer la version bêta en parallèle de la <a href="https://f-droid.org/packages/org.openhab.habdroid/">version stable</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Politique de Confidentialité : https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Essayer les nouvelles fonctionnalités et donner un premier retour d'expérience !</beta>
     <play_beta>Vous pouvez installer la version bêta parallèlement à la version stable .</play_beta>
     <changelog_play_beta>Correction de bugs et améliorations de la stabilité de l'app. Veuillez consulter https://github.com/openhab/openhab-android/releases pour un journal détaillé des modifications.</changelog_play_beta>
diff --git a/assets/store_descriptions/he-IL/strings.xml b/assets/store_descriptions/he-IL/strings.xml
index c00148345f..9ee075530f 100644
--- a/assets/store_descriptions/he-IL/strings.xml
+++ b/assets/store_descriptions/he-IL/strings.xml
@@ -19,7 +19,7 @@
     <short_description>אוטומציה לבית החכם מבוססת על קוד פתוח ובלתי מוגבלת לטכנולוגיה וחברה מסויימת</short_description>
     <fdroid>גרסאות עבור FCM ו-F-Droid הוסרו ולכן הם לא יוכלו לקבל התראות דחיפה מ-openHAB Cloud. במקום זאת, ההתראות נבדקות על בסיס קבוע בגרסאות האלו.</fdroid>
     <fdroid_beta><![CDATA[באפשרותך להתקין את גירסת הבטא לצד <a href="https://f-droid.org/packages/org.openhab.habdroid/">הגרסה היציבה</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>מדיניות פרטיות: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>נסה תכונות חדשות וספר לנו מה דעתך!</beta>
     <play_beta>באפשרותך להתקין את גירסת הבטא לצד הגרסה היציבה.</play_beta>
     <changelog_play_beta>תיקוני באגים ושיפורי יציבות. אנא בקר ב- https://github.com/openhab/openhab-android/releases למידע מפורט אודות השינויים.</changelog_play_beta>
diff --git a/assets/store_descriptions/hu-HU/strings.xml b/assets/store_descriptions/hu-HU/strings.xml
index f7d20ce26a..4d69550b3a 100644
--- a/assets/store_descriptions/hu-HU/strings.xml
+++ b/assets/store_descriptions/hu-HU/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Szabadgondolkozású technológia, nyílt forráskódú otthonautomatizálás</short_description>
     <fdroid>Az F-Droid-ra készült változat nem tartalmazza az FCM-et és hibajelentő modult, így nem tud értesítési üzenetet fogadni az openHAB felhőből. Ehelyett az értesítések rendszeresen lekérdezésre kerülnek ezekből az összeállításokból.</fdroid>
     <fdroid_beta><![CDATA[A béta változatot a <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabil verzió</a> mellé is telepítheted.]]></fdroid_beta>
-    <fdroid_privacy_policy>Adatvédelemi tájékoztató: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Próbáld ki az új funkciókat és adj korai visszajelzést!</beta>
     <play_beta>Telepíthetsz béta verziót is a stabil mellé.</play_beta>
     <changelog_play_beta>Hibajavítások és kisebb fejlesztések. Kérem látogassa meg a https://github.com/openhab/openhab-android/releases hogy többet tudjon meg a változásokról.</changelog_play_beta>
diff --git a/assets/store_descriptions/id-ID/strings.xml b/assets/store_descriptions/id-ID/strings.xml
index 0cbe782235..7011fbbb2e 100644
--- a/assets/store_descriptions/id-ID/strings.xml
+++ b/assets/store_descriptions/id-ID/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Vendor dan teknologi agnostik otomatisasi rumah open source</short_description>
     <fdroid> </fdroid>
     <fdroid_beta><![CDATA[Anda dapat memasang versi beta bersama <a href="https://f-droid.org/packages/org.openhab.habdroid/">versi stabil</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Kebijakan privasi: https://www.oprnhabfiundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Coba fitur-fitur baru dan berikan tanggapan lebih awal!</beta>
     <play_beta>Anda dapat memasang versi beta bersama versi stabil.</play_beta>
     <changelog_play_beta> </changelog_play_beta>
diff --git a/assets/store_descriptions/it-IT/strings.xml b/assets/store_descriptions/it-IT/strings.xml
index cace5a1195..378962f73f 100644
--- a/assets/store_descriptions/it-IT/strings.xml
+++ b/assets/store_descriptions/it-IT/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Soluzione domotica open source indipendente dalla tecnologia e dai produttori</short_description>
     <fdroid>Le build su F-Droid hanno rimosso FCM e quindi non saranno in grado di ricevere notifiche push da openHAB Cloud. Invece, le notifiche sono controllate su base regolare in questi compilati.</fdroid>
     <fdroid_beta><![CDATA[È possibile installare la versione beta insieme alla <a href="https://f-droid.org/packages/org.openhab.habdroid/">versione stabile</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Informativa sulla privacy: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy>Informativa Privacy: https://www.openhabfoundation.org/privacy.html#android-app</fdroid_privacy_policy>
     <beta>Prova le nuove funzioni e dai un feedback quanto prima!</beta>
     <play_beta>È possibile installare la versione beta insieme alla versione stabile.</play_beta>
     <changelog_play_beta>Correzioni di bug e stabilità migliorata. Visita https://github.com/openhab/openhab-android/releases per un changelog dettagliato.</changelog_play_beta>
diff --git a/assets/store_descriptions/ja-JP/strings.xml b/assets/store_descriptions/ja-JP/strings.xml
index d908bd27ba..fdcb336f7d 100644
--- a/assets/store_descriptions/ja-JP/strings.xml
+++ b/assets/store_descriptions/ja-JP/strings.xml
@@ -19,7 +19,7 @@
     <short_description>ベンダーや技術に依存しないオープンソースのホーム・オートメーション</short_description>
     <fdroid> 代わりに、これらのビルドでは通知が定期的にポーリングされます。</fdroid>
     <fdroid_beta><![CDATA[<a href="https://f-droid.org/packages/org.openhab.habdroid/">安定版</a> の他、ベータ版をインストールすることができます。]]></fdroid_beta>
-    <fdroid_privacy_policy>プライバシー ポリシー: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>新しい機能をお試しの上、フィードバックしてください!</beta>
     <play_beta>安定版の他にベータ版をインストールできます.</play_beta>
     <changelog_play_beta>バグ修正と安定性の改善。 変更履歴は https://github.com/openhab/openhab-android/releases をご覧ください。</changelog_play_beta>
diff --git a/assets/store_descriptions/lb-LU/strings.xml b/assets/store_descriptions/lb-LU/strings.xml
index f700798b2f..9e56632872 100644
--- a/assets/store_descriptions/lb-LU/strings.xml
+++ b/assets/store_descriptions/lb-LU/strings.xml
@@ -20,7 +20,7 @@ https://www.openhab.org/addons/</bindings>
     <short_description>Hiersteller an Technologie neutral Open-Source Heem-Automatisatioun</short_description>
     <fdroid>An der F-Droid Versioun sinn FCM an Crash-Rapporten erausgeholl ginn. Dofir ass et net méiglech fir Push-Notifikatiounen vun der openHAB Cloud ze kréien. Am platz heivunner, ginn d‘ Notifikatiounen an dëse Builds reegelméisseg ofgefrot.</fdroid>
     <fdroid_beta><![CDATA[Du kann s d´ Beta Versioun parallel zu der <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabiler Versioun</a> installéieren.]]></fdroid_beta>
-    <fdroid_privacy_policy>Dateschutzerklärung: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Probéier nei Features aus a gëff eis Feedback!</beta>
     <play_beta>Du kann s d´ Beta Versioun parallel zu der stabeler Versioun installéieren.</play_beta>
     <changelog_play_beta>Feeler an Stabilitéits Verbesserungen. Fir den Log vun den Ännerungen kuck ënnert https://github.com/openhab/openhab-android/releases.</changelog_play_beta>
diff --git a/assets/store_descriptions/nb-NO/strings.xml b/assets/store_descriptions/nb-NO/strings.xml
index 7c0f821da6..7e16860105 100644
--- a/assets/store_descriptions/nb-NO/strings.xml
+++ b/assets/store_descriptions/nb-NO/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Leverandør- og teknologiuavhengig åpen kildekode for hjemmeautomasjon</short_description>
     <fdroid>Utgavene hos F-Droid er uten FCM og vil derfor ikke kunne motta push varsler fra openHAB Cloud. I stedet blir det sjekket for varsler regelmessig i disse utgavene.</fdroid>
     <fdroid_beta><![CDATA[Du kan installere betaversjonen sammen med den <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabile versjonen</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Personvern: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy>Personvernerklæring: https://www.openhabfoundation.org/privacy.html#android-app</fdroid_privacy_policy>
     <beta>Prøv ut nye funksjoner og gi tidlig tilbakemelding!</beta>
     <play_beta>Du kan installere betaversjonen sammen med den stabile versjonen.</play_beta>
     <changelog_play_beta>Feilrettinger og stabilitetsforbedringer. Vennligst besøk https://github.com/openhab/openhab-android/releases for en detaljert endringslogg.</changelog_play_beta>
diff --git a/assets/store_descriptions/nl-NL/strings.xml b/assets/store_descriptions/nl-NL/strings.xml
index 62c2f95585..ba8ff0415c 100644
--- a/assets/store_descriptions/nl-NL/strings.xml
+++ b/assets/store_descriptions/nl-NL/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Leverancier en technologie onafhankelijke open source domotica software</short_description>
     <fdroid>De builds op F-Droid hebben geen ondersteuning voor FCM en kunnen geen push-meldingen ontvangen van openHAB Cloud. In plaats daarvan worden in deze versie meldingen regelmatig opgevraagd bij de server.</fdroid>
     <fdroid_beta><![CDATA[U kunt de beta-versie installeer samen met de <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabiele versie</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Privacybeleid: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Probeer nieuwe functies uit en geef alvast feedback!</beta>
     <play_beta>De beta versie kan geïnstalleerd worden naast de stabiele versie.</play_beta>
     <changelog_play_beta>Bug fixes en stabiliteitsverbeteringen. Bezoek https://github.com/openhab/openhab-android/releases voor een gedetailleerde changelog.</changelog_play_beta>
diff --git a/assets/store_descriptions/pl-PL/strings.xml b/assets/store_descriptions/pl-PL/strings.xml
index 468eb4de17..58f58cafc0 100644
--- a/assets/store_descriptions/pl-PL/strings.xml
+++ b/assets/store_descriptions/pl-PL/strings.xml
@@ -20,7 +20,7 @@ znaleźć wskazówki, pomoc i inspirację. Dołącz do forum społeczności open
     <short_description>Agnostyczna technologia automatyki domowej dla dostawców i technologii</short_description>
     <fdroid>Kompilacje na F-Droid mają usuwane FCM i nie będą mogły odbierać powiadomień push od openHAB Cloud. </fdroid>
     <fdroid_beta><![CDATA[Możesz zainstalować wersję beta obok <a href="https://f-droid.org/packages/org.openhab.habdroid/">stable version</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Polityka prywatności: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Wypróbuj nowe funkcje i dziel się uwagami!</beta>
     <play_beta>Możesz zainstalować wersję beta obok wersji stabilnej.</play_beta>
     <changelog_play_beta>Poprawki błędów i poprawki stabilności. Odwiedź https://github.com/openhab/openhab-android/releases po dokładną listę zmian.</changelog_play_beta>
diff --git a/assets/store_descriptions/pt-BR/strings.xml b/assets/store_descriptions/pt-BR/strings.xml
index 4352d5c20b..1ae58a1ebb 100644
--- a/assets/store_descriptions/pt-BR/strings.xml
+++ b/assets/store_descriptions/pt-BR/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Fornecedor e tecnologia agnóstica de código aberto de automação residencial</short_description>
     <fdroid>As compilações em F-Droid têm FCM e o relatório de falha removidos e não serão capazes de receber notificações push do openHAB Cloud. Em vez disso, as notificações são consultadas regularmente nestas compilações.</fdroid>
     <fdroid_beta><![CDATA[Você pode instalar a versão beta junto da <a href="https://f-droid.org/packages/org.openhab.habdroid/">versão estável</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Política de privacidade: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Experimente novos recursos e dê feedback antecipado!</beta>
     <play_beta>Você pode instalar a versão beta juntamente com a versão estável.</play_beta>
     <changelog_play_beta>Correção de bugs e melhoria na estabilidade. Por favor, visite https://github.com/openhab/openhab-android/releases para um log de alterações detalhado.</changelog_play_beta>
diff --git a/assets/store_descriptions/ro-RO/strings.xml b/assets/store_descriptions/ro-RO/strings.xml
index f50333f341..9f963a5872 100644
--- a/assets/store_descriptions/ro-RO/strings.xml
+++ b/assets/store_descriptions/ro-RO/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Automatizare de locuințe open source, independentă de producători și tehnologii</short_description>
     <fdroid>Build-urile de pe F-Droid au eliminat FCM, raportarea erorilor nu vor putea primi notificări push de la openHAB Cloud. În schimb, notificările sunt interogate regulat în aceste versiuni.</fdroid>
     <fdroid_beta><![CDATA[Puteți instala versiunea beta alături de <a href="https://f-droid.org/packages/org.openhab.habdroid/">versiunea stabilă</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Politica de confidențialitate: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Încercați funcții noi și lăsați primele impresii!</beta>
     <play_beta>Poți instala versiunea beta alături de versiunea stabilă.</play_beta>
     <changelog_play_beta>Diferite îmbunătăţiri de stabilitate şi bug-uri rezolvate. Vă rugăm să vizitați https://github.com/openhab/openhab-android/releases pentru a vedea istoricul schimbarilor.</changelog_play_beta>
diff --git a/assets/store_descriptions/ru-RU/strings.xml b/assets/store_descriptions/ru-RU/strings.xml
index 2df7183921..84ac0c9514 100644
--- a/assets/store_descriptions/ru-RU/strings.xml
+++ b/assets/store_descriptions/ru-RU/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Поставщик технологий с открытым исходным кодом для автоматизации "умного дома"</short_description>
     <fdroid>В сборках F-Droid были удалены FCM и отчеты о сбоях и нет возможности получать push-уведомления от openHAB Cloud. Вместо этого в этих сборках проверка уведомлений происходит на основе опроса сервера.</fdroid>
     <fdroid_beta><![CDATA[Вы можете установить бета версию параллельно со <a href="https://f-droid.org/packages/org.openhab.habdroid/">стабильной версией</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Политика конфиденциальности: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Попробуйте новые функции и оставьте о них отзыв!</beta>
     <play_beta>Вы можете установить бета-версию вместе со стабильной версией.</play_beta>
     <changelog_play_beta>Исправлены ошибки и улучшена стабильность. Пожалуйста, посетите https://github.com/openhab/openhab-android/releases для подробного списка изменений.</changelog_play_beta>
diff --git a/assets/store_descriptions/sl-SI/strings.xml b/assets/store_descriptions/sl-SI/strings.xml
index 58b81b605d..86cc39edbb 100644
--- a/assets/store_descriptions/sl-SI/strings.xml
+++ b/assets/store_descriptions/sl-SI/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Hišna avtomatika neodvisna od proizvajalcev in tehnologije</short_description>
     <fdroid> Namesto tega te verzije pridobivajo obvestila z rednim poizvedovanjem.</fdroid>
     <fdroid_beta><![CDATA[Beta verzijo lahko namestite poleg <a href="https://f-droid.org/packages/org.openhab.habdroid/">redne verzije</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Politika zasebnosti: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Preizkusite nove funkcionalnosti in nam posredujte povratne informacije!</beta>
     <play_beta>Beta verzijo lahko namestite poleg redne verzije.</play_beta>
     <changelog_play_beta>Popravki žužkov in izboljšanje stabilnosti. Obiščite nas na https://github.com/openhab/openhab-android/releases za podrobni seznam sprememb.</changelog_play_beta>
diff --git a/assets/store_descriptions/sv-SE/strings.xml b/assets/store_descriptions/sv-SE/strings.xml
index 75670c3cf9..5e37c97b7f 100644
--- a/assets/store_descriptions/sv-SE/strings.xml
+++ b/assets/store_descriptions/sv-SE/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Hemautomatisering med öppen källkod oberoende av tillverkare eller teknologi</short_description>
     <fdroid> </fdroid>
     <fdroid_beta><![CDATA[Beta-versionen kan installeras parallellt med den <a href="https://f-droid.org/packages/org.openhab.habdroid/">stabila versionen</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Integritetspolicy: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Testa nya funktioner och ge tidig feedback!</beta>
     <play_beta>Beta-versionen kan installeras parallellt med den stabila versionen.</play_beta>
     <changelog_play_beta> </changelog_play_beta>
diff --git a/assets/store_descriptions/tr-TR/strings.xml b/assets/store_descriptions/tr-TR/strings.xml
index 5f5705c43f..e0d1a4ce29 100644
--- a/assets/store_descriptions/tr-TR/strings.xml
+++ b/assets/store_descriptions/tr-TR/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Satıcı ve teknoloji agnostik açık kaynaklı ev otomasyonu</short_description>
     <fdroid>F-Droid'deki yapılarda FCM kaldırılmıştır ve bu nedenle openHAB Cloud'dan anında iletme bildirimleri alamaz. Bunun yerine, bu yapılarda bildirimler düzenli olarak yoklanır.</fdroid>
     <fdroid_beta><![CDATA[Beta sürümünü <a href="https://f-droid.org/packages/org.openhab.habdroid/">kararlı sürüm</a> ile birlikte kurabilirsiniz.]]></fdroid_beta>
-    <fdroid_privacy_policy>Gizlilik Politikası: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Yeni özellikleri deneyin ve erken geri bildirimde bulunun!</beta>
     <play_beta>Beta sürümünü, kararlı sürümün yanında da yükleyebilirsiniz.</play_beta>
     <changelog_play_beta>Hata düzeltmeleri ve kararlılık iyileştirmeleri. Ayrıntılı bir değişiklik günlüğü için lütfen https://github.com/openhab/openhab-android/releases adresini ziyaret edin.</changelog_play_beta>
diff --git a/assets/store_descriptions/uk-UA/strings.xml b/assets/store_descriptions/uk-UA/strings.xml
index 9603766ae9..6a13f35acb 100644
--- a/assets/store_descriptions/uk-UA/strings.xml
+++ b/assets/store_descriptions/uk-UA/strings.xml
@@ -19,7 +19,7 @@
     <short_description>Відкрите ПЗ для домашньої автоматизації, неупереджене до виробників і технологій</short_description>
     <fdroid>У версії для F-Droid, FCM видалено, тому ви не зможете отримувати push сповіщення від openHAB Cloud. Натомість, сповіщення перевіряються на регулярній основі в цих будівлях.</fdroid>
     <fdroid_beta><![CDATA[Ви можете встановити бета версію разом зі <a href="https://f-droid.org/packages/org.openhab.habdroid/">стабільною версією</a>.]]></fdroid_beta>
-    <fdroid_privacy_policy>Політика конфіденційності: https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>Спробуйте нові функції і залиште швидкий відгук!</beta>
     <play_beta>Ви можете встановити бета версію разом зі стабільною.</play_beta>
     <changelog_play_beta>Виправлення помилок і поліпшення надійності. Будь ласка відвідайте https://github.com/openhab/openhab-android/releases для деталей змін.</changelog_play_beta>
diff --git a/assets/store_descriptions/zh-CN/strings.xml b/assets/store_descriptions/zh-CN/strings.xml
index df1bdc0d02..4986985806 100644
--- a/assets/store_descriptions/zh-CN/strings.xml
+++ b/assets/store_descriptions/zh-CN/strings.xml
@@ -19,7 +19,7 @@
     <short_description>开源家居自动化供应商与技术</short_description>
     <fdroid>在 F-Droid 上的版本已删除 FCM ，因此无法从 openHAB Cloud 接收推送通知。 替代，在这些 builds 中进行定期轮询通知。</fdroid>
     <fdroid_beta><![CDATA[<a href="https://f-droid.org/packages/org.openhab.habdroid/">稳定版</a>可与测试版共存。]]></fdroid_beta>
-    <fdroid_privacy_policy>隐私政策：https://www.openhabfoundation.org/privacy.html</fdroid_privacy_policy>
+    <fdroid_privacy_policy/>
     <beta>尝试新功能并提供早期反馈！</beta>
     <play_beta>您可以在安装稳定版的情况下安装测试版。</play_beta>
     <changelog_play_beta>修复了漏洞并提升了稳定性。 请访问 https://github.com/openhab/openhab-android/releases 以获取详细更新日志。</changelog_play_beta>
diff --git a/mobile/src/main/res/values-nb/strings.xml b/mobile/src/main/res/values-nb/strings.xml
index 17410b600e..1c0b2aaec9 100644
--- a/mobile/src/main/res/values-nb/strings.xml
+++ b/mobile/src/main/res/values-nb/strings.xml
@@ -14,11 +14,13 @@
     <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
     <string name="mainmenu_openhab_preferences">Innstillinger</string>
     <string name="mainmenu_openhab_habpanel">HABPanel</string>
+    <string name="mainmenu_openhab_main_ui">Main UI</string>
     <string name="mainmenu_openhab_frontail">Frontail</string>
     <!-- %1$s: Name of a UI, %2$s: Server name. Example: HABPanel (House). Use the source string as translation if the punctuation rules are the same as in English. -->
     <string name="ui_on_server">%1$s (%2$s)</string>
     <string name="app_notifications">Varslinger</string>
     <string name="habpanel_error">Det oppstod en feil under innlasting av HABPanel</string>
+    <string name="main_ui_error">En feil oppstod under lasting av Main UI</string>
     <string name="frontail_error">Det oppstod en feil under lasting av Frontail. Vær oppmerksom på at det ikke er tilgjengelig via openHAB Cloud.</string>
     <string name="mainmenu_openhab_selectsitemap">Velg standard Sitemap</string>
     <string name="mainmenu_openhab_clearcache">Tøm bildebuffer</string>
@@ -39,6 +41,8 @@
     <string name="settings_openhab_sslclientcert">SSL klientsertifikat</string>
     <string name="settings_openhab_sslclientcert_howto_summary">Trykk her for å få hint og forklaring på hvordan å sette opp SSL klientsertifikat autentisering</string>
     <string name="settings_openhab_sslclientcert_not_supported">SSL klientsertifikater er ikke støttet av din enhet</string>
+    <string name="frontail_url_title">Frontail URL</string>
+    <string name="frontail_url_summary">URL\'en til Frontail. Frontail kommer med openHABian eller kan installered manuelt. La stå tom for å bruke standardinnstillingen. Nåværende innstilling: %s</string>
     <string name="settings_openhab_screentimeroff">Deaktiver skjermtidsavbrudd</string>
     <string name="settings_openhab_screentimeroff_summary">Skjermen slår seg ikke av mens openHAB kjører</string>
     <string name="settings_openhab_demomode">Demomodus</string>
@@ -53,6 +57,7 @@
     <string name="settings_sitemap_compact_mode_off">Bruk et to-linjers oppsett for Sitemap widgeter, hvilket gjør kontrollene større og derav lettere å bruke, men krever mer rulling for lengre lister</string>
     <string name="settings_sitemap_compact_mode_on">Bruk et en-linjes oppsett for Sitemap widgeter, hvilket plasserer så mange widgeter som mulig på skjermen, men reduserer størrelsen på kontrollene</string>
     <string name="settings_color_scheme_title">Fargepalett</string>
+    <string name="settings_show_icons">Vis ikoner</string>
     <string name="settings_openhab_icon_format">Ikonformatering</string>
     <string name="settings_openhab_icon_format_png">Bitmap</string>
     <string name="settings_openhab_icon_format_svg">Vektor</string>
@@ -82,6 +87,9 @@
     <string name="settings_notification_vibration_long">Lang</string>
     <string name="settings_notification_vibration_twice">Dobbel</string>
     <string name="settings_notification_ringtone_vibration">Ringetone &amp; Vibrering</string>
+    <string name="settings_notification_reset_settings">Tilbakestill kategorier</string>
+    <string name="settings_notification_reset_settings_confirm">Vil du fjerne alle varslingskategoriene? De vil bli gjenopprettet når en ny varsling ankommer for denne kategorien.</string>
+    <string name="settings_notification_hint">Alvorlighetsgraden for varsler via myopenHAB.org er satt som varselkategori. Du kan konfigurere forskjellige varslingsinnstillinger for hver kategori.</string>
     <string name="settings_connection_summary">Koblet til %s</string>
     <!-- %1$s: URL, %2$s: Reason why connection is insecure -->
     <string name="settings_insecure_connection_summary">Usikkert tilkoblet %1$s: %2$s</string>