diff --git a/assets/store_descriptions/af-ZA/strings.xml b/assets/store_descriptions/af-ZA/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/af-ZA/strings.xml
+++ b/assets/store_descriptions/af-ZA/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/ar-SA/strings.xml b/assets/store_descriptions/ar-SA/strings.xml
index 7084bec0f51bd5c3bf3a9f51543a13364b1e9b15..89e9b30f8d93d9f9172ea6eba94817ba8f53887c 100644
--- a/assets/store_descriptions/ar-SA/strings.xml
+++ b/assets/store_descriptions/ar-SA/strings.xml
@@ -27,7 +27,7 @@ https://docs.openhab.org/addons/bindings.html. </bindings>
     <oh_server>أنت بحاجة إلى خادم openHAB لهذا التطبيق</oh_server>
     <short_description/>
     <fdroid>إصدارات F-Droid تدعم عرض الخريطة، تراسل سحابة جوجل GCM بينما حذفت تقارير الإنهيار ومن غير الممكن إستقبال الإشعارات من سحابة openHAB.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/bg-BG/strings.xml b/assets/store_descriptions/bg-BG/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/bg-BG/strings.xml
+++ b/assets/store_descriptions/bg-BG/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/ca-ES/strings.xml b/assets/store_descriptions/ca-ES/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/ca-ES/strings.xml
+++ b/assets/store_descriptions/ca-ES/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/cs-CZ/strings.xml b/assets/store_descriptions/cs-CZ/strings.xml
index cffde8db3a8673cee5a183908e8cfe840dd47506..d208628ad9ab3d85b150ba4ae6acaf122e5503be 100644
--- a/assets/store_descriptions/cs-CZ/strings.xml
+++ b/assets/store_descriptions/cs-CZ/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <strings>
-    <intro/>
+    <intro>openHAB - "empowering the smart home" - open source program pro domácí automatizaci IoT zařízení od různých výrobců s různou technologií</intro>
     <whatis>openHAB je open source platforma pro automatizaci domácnosti, založená na Java, která integruje a kombinuje širokou škálu různých systémů a technologií pro automatizaci domácnosti do jediného řešení.</whatis>
     <rules>Všechna připojená zařízení je možné spravovat, ovládat a automatizovat pomocí vlastních pravidel a různých uživatelských rozhraní.</rules>
     <supported>Podporované produkty</supported>
-    <bindings>Více než 200 doplňků přidává podporu pro značky, zařízení, technologie a komunikační protokoly. Například Z-Wave, Philips Hue, Amazon Echo, Chromecast a Sonos. </bindings>
+    <bindings>Více než 200 doplňků přidává podporu pro značky, zařízení, technologie a komunikační protokoly. Například Z-Wave, Philips Hue, Amazon Echo, Chromecast a Sonos. Všechny dostupné doplňky a podporovaná zařízení a/nebo funkce najdete na: https://www.openhab.org/addons/</bindings>
 
     <home_automation_solutions>• Řešení domácí automatizace: Z-Wave, Banaba, Netatmo, Homematic, Insteon,...</home_automation_solutions>
     <lighting>• Osvětlení: Philips Hue, Ikea Trådfri, LIFX, Lutron, Milight,...</lighting>
@@ -18,18 +18,18 @@
     <oss_community>Open Source komunita</oss_community>
     <forum>openHAB open source iniciativa je silně podporována jeho živou komunitou. Fórum s více než 13 000 registrovaných uživatelů je místo, kde najdete návod, pomoc a inspiraci. Připojte se k diskuznímu fóru openHAB na https://community.openhab.org</forum>
 
-    <report_issues/>
+    <report_issues>Případné nalezené chyby či problémy nahlaste prosím, ve fóru nebo v https://github.com/openhab/openhab-android/issues</report_issues>
     <translation>Pokud chcete aplikaci přeložit do vašeho jazyka připojte se k nám na https://crowdin.com/project/openhab-android</translation>
     <foundation>openHAB Foundation</foundation>
     <about_foundation>OpenHAB Foundation e.V. je nezisková organizace s posláním vzdělávat veřejnost o možnostech a výhodách svobodných a otevřených chytrých řešeních pro domácí automatizaci. Další informace o poslání a službách nadace naleznete na https://www.openhabfoundation.org</about_foundation>
     <important_note>Důležitá poznámka</important_note>
     <oh_server>Pro správné fungování aplikace budete potřebovat openHAB server</oh_server>
-    <short_description/>
+    <short_description>Domácí automatizace pro IoT různých výrobců a technologií</short_description>
     <fdroid>F-Droid podporuje zobrazení mapy, GCM a notifikace byly odebrány a tedy nelze přijímat push notifikace z openHAB cloudu.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
-    <fdroid_privacy_policy/>
-    <fdroid_anti_features/>
-    <fdroid_anti_features_text/>
-    <beta/>
-    <play_beta/>
+    <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</fdroid_privacy_policy>
+    <fdroid_anti_features>Potenciálně nechtěné vlastnosti</fdroid_anti_features>
+    <fdroid_anti_features_text>Aplikace je označena příznakem "NonFreeAsset", protože openHAB ikona není k dispozici pod svobodnou licencí.</fdroid_anti_features_text>
+    <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>
 </strings>
diff --git a/assets/store_descriptions/da-DK/strings.xml b/assets/store_descriptions/da-DK/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..6c7426e49f0f78c9d28f2fe129103542494809a0 100644
--- a/assets/store_descriptions/da-DK/strings.xml
+++ b/assets/store_descriptions/da-DK/strings.xml
@@ -26,8 +26,8 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
-    <fdroid_privacy_policy/>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
+    <fdroid_privacy_policy>Fortrolighedspolitik: https://www.openhabfoundation.org/privacy</fdroid_privacy_policy>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
     <beta/>
diff --git a/assets/store_descriptions/de-DE/strings.xml b/assets/store_descriptions/de-DE/strings.xml
index a82a16d8e018796fd87a11f5762e373f577d4380..46d3a2240b1a9355e435860f272fa3fe8d863cb5 100644
--- a/assets/store_descriptions/de-DE/strings.xml
+++ b/assets/store_descriptions/de-DE/strings.xml
@@ -26,7 +26,7 @@
     <oh_server>Um diese App zu nutzen, benötigen Sie einen openHAB-Server</oh_server>
     <short_description>Technologie- und herstellerunabhängige, quelloffene Automatisierungslösung</short_description>
     <fdroid>In der F-Droid-Version wurden die Unterstützung für Mapview-Elemente, GCM und die Übermittlung von Absturzberichten entfernt. Mit dieser Version können keine Nachrichten von einer openHAB-Cloud-Instanz empfangen werden.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <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</fdroid_privacy_policy>
     <fdroid_anti_features>Anti-Features</fdroid_anti_features>
     <fdroid_anti_features_text>Die App wurde mit dem "NonFreeAsset"-Anti-Feature markiert, da das openHAB-Icon nicht unter freier Lizenz steht.</fdroid_anti_features_text>
diff --git a/assets/store_descriptions/el-GR/strings.xml b/assets/store_descriptions/el-GR/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/el-GR/strings.xml
+++ b/assets/store_descriptions/el-GR/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/es-ES/strings.xml b/assets/store_descriptions/es-ES/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/es-ES/strings.xml
+++ b/assets/store_descriptions/es-ES/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/fi-FI/strings.xml b/assets/store_descriptions/fi-FI/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..b4c2e7cb6bf5f42bf251c0b8cc4ce28b4be697e3 100644
--- a/assets/store_descriptions/fi-FI/strings.xml
+++ b/assets/store_descriptions/fi-FI/strings.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <strings>
-    <intro/>
-    <whatis/>
-    <rules/>
-    <supported/>
-    <bindings>  </bindings>
+    <intro>openHAB - "empowering the smart home" - Teknologia- ja valmistajariippumatonta, avoimen lähdekoodin kotiautomaatiota</intro>
+    <whatis>openHAB on Java-pohjainen avoimen lähdekoodin kotiautomaatioalusta. Se yhdistää laajan valikoiman useiden valmistajien älykotilaitteita ja eri teknologioita yhdeksi ratkaisuksi.</whatis>
+    <rules>Kaikki yhdistetyt laitteet ovat käytettävissä erilaisissa käyttöliittymissä sekä ohjelmoitaessa automaatiologiikkaa.</rules>
+    <supported>Tuetut laitteet ja tuotteet</supported>
+    <bindings>Yli 200 yksilöllistä lisäosaa antaa tuen erilaisille tuotteille, laitteille, teknologioille ja protokollille. Esimerkkeinä Z-Wave, Philips Hue, Amazon Echo, Chromecast ja Sonos. Loydä kaikki saatavailla olevat lisäosat ja tuetut laitteet sekä toiminnot osoitteesta: https://www.openhab.org/addons/</bindings>
 
-    <home_automation_solutions/>
-    <lighting/>
-    <heating/>
-    <home_entertainment/>
-    <security/>
-    <open_protocols/>
-    <special_useCases/>
-    <empty_point/>
+    <home_automation_solutions>• Kotiautomaatio: Z-Wave, EnOcean, Netatmo, Homematic, Insteon, ...</home_automation_solutions>
+    <lighting>• Valaistus: Philips Hue, Ikea Trådfri, LIFX, Lutron, Milight, ...</lighting>
+    <heating>• Lämmitys: Max!, Nest, Vitotronic, Heatmiser, ...</heating>
+    <home_entertainment>• Viihde: LG TV, Samsung TV, Plex, Pioneer AVR, Squeezebox, Sonos, Kodi, ...</home_entertainment>
+    <security>• Turvallisuus: ZoneMinder, DSC,...</security>
+    <open_protocols>• Avoimet protokollat: TCP/UDP, HTTP, Serial, MQTT...</open_protocols>
+    <special_useCases>• Erikoissovellukset: Minecraft, Tesla auto, sääpalvelut,...</special_useCases>
+    <empty_point>• ...</empty_point>
 
-    <oss_community/>
-    <forum>  </forum>
+    <oss_community>Avoimen lähdekoodin yhteisö</oss_community>
+    <forum>OpenHAB avoimen lähdekoodin aloite tukee voimakkaasti sen elävää yhteisöä. Yli 13 000 rekisteröityneen käyttäjän foorumi on paikka löytää ohjausta, apua ja inspiraatiota. Liittyi openHAB yhteisön foorumille osoitteessa https://community.openhab.org</forum>
 
-    <report_issues/>
-    <translation/>
-    <foundation/>
-    <about_foundation> </about_foundation>
-    <important_note/>
-    <oh_server/>
-    <short_description/>
-    <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
-    <fdroid_privacy_policy/>
-    <fdroid_anti_features/>
-    <fdroid_anti_features_text/>
-    <beta/>
-    <play_beta/>
+    <report_issues>Löytäessäsi ongelman ilmoita siitä foorumilla tai osoitteessa https://github.com/openhab/openhab-android/issues</report_issues>
+    <translation>Jos haluat kääntää tämän sovelluksen omalle kielellesi niin liity mukaan osoitteessa https://crowdin.com/project/openhab-android</translation>
+    <foundation>openHAB Säätiö</foundation>
+    <about_foundation>OpenHAB Säätiö e.V. on yleishyödyllinen järjestö, jonka tehtävänä on kertoa yleisölle ilmaisten ja vapaiden älykotiratkaisuiden mahdollisuuksista ja eduista. Lisätietoja järjestön tehtävästä ja palveluista löydät osoitteesta https://www.openhabfoundation.org</about_foundation>
+    <important_note>Tärkeä huomautus</important_note>
+    <oh_server>Tarvitset openHAB palvelimen tätä sovellusta varten</oh_server>
+    <short_description>Toimittaja- ja teknologiariippumatonta avoimen lähdekoodin kotiautomaatiota</short_description>
+    <fdroid>F-Droid sovelluskaupasta ladatuissa koontiversioissa on tuki karttanäytölle, mutta GCM ja kaatumisilmoitukset ovat pois käytöstä eikä ilmoitukset openHAB pilvestä ole käytettävissä.</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</fdroid_privacy_policy>
+    <fdroid_anti_features>Anti-ominaisuudet</fdroid_anti_features>
+    <fdroid_anti_features_text>Sovellus on merkitty lipulla ”NonFreeAsset”, koska OpenHAB kuvaketta ei ole vapaalla lisenssillä.</fdroid_anti_features_text>
+    <beta>Kokeilla uusia ominaisuuksia ja anna pian palautetta!</beta>
+    <play_beta>Voit asentaa beta version vakaan version rinnalle.</play_beta>
 </strings>
diff --git a/assets/store_descriptions/fr-FR/strings.xml b/assets/store_descriptions/fr-FR/strings.xml
index ceb882ba000d2344b0abbbb9d13b686cf96392a3..2a7491d7a922f644e62c432c70c18b98d869a991 100644
--- a/assets/store_descriptions/fr-FR/strings.xml
+++ b/assets/store_descriptions/fr-FR/strings.xml
@@ -13,7 +13,7 @@
     <security/>
     <open_protocols/>
     <special_useCases/>
-    <empty_point/>
+    <empty_point>• ...</empty_point>
 
     <oss_community>Communauté open source</oss_community>
     <forum>  </forum>
@@ -26,7 +26,7 @@
     <oh_server>Un serveur openHAB est nécessaire pour fonctionner avec cette app</oh_server>
     <short_description/>
     <fdroid>Les versions publiées via F-Droid n'incluent pas le système GCM et les rapports de plantage, et elles ne seront pas en mesure de recevoir les notifications push depuis l’openHAB Cloud.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/he-IL/strings.xml b/assets/store_descriptions/he-IL/strings.xml
index bb9e19bd05e2e745b4e5474cf51ef1730db9ae94..5e59e6d90fe3a9526671a06734702ca1d573f5b6 100644
--- a/assets/store_descriptions/he-IL/strings.xml
+++ b/assets/store_descriptions/he-IL/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <strings>
-    <intro>openHAB - "העצמת הבית החכם" - פרוייקט קוד פתוח לבית חכם לאנשים וחברות בראייה טכנולוגית מתקדמת</intro>
+    <intro>openHAB - "העצמת הבית החכם" - אוטומצית הבית החכם לאנשים וחברות בראייה טכנולוגית מתקדמת מבוסס קוד פתוח</intro>
     <whatis>openHAB היא פלטפורמת אוטומציה ביתית מבוססת קוד פתוח מבוססת Java, המשלבת מגוון רחב של מערכות וטכנולוגיות ביתיות חכמות לפתרון אחד.</whatis>
     <rules>קיימת אפשרות לבצע אוטומציה, להגדיר כללים וממשקי משתמש שונים ומגוונים על גבי שכבת הרכיבים המחוברים.</rules>
     <supported>מוצרים נתמכים</supported>
@@ -26,7 +26,7 @@
     <oh_server>יש צורך בשרת openHAB עבור יישום זה</oh_server>
     <short_description>אוטומציה לבית החכם מבוססת על קוד פתוח ובלתי מוגבלת לטכנולוגיה וחברה מסויימת</short_description>
     <fdroid>תוכנות עבור F-Droid מכילות תצוגת מיפוי, GCM ודיווחי שגיאה על התרסקות הוסרו ולא יוכלו לקבל התראות בדחיפה מענן openHAB.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[באפשרותך להתקין את גירסת הבטא לצד <a href="https://f-droid.org/packages/org.openhab.habdroid/">הגרסה היציבה</a>.]]></fdroid_beta>
     <fdroid_privacy_policy>מדיניות פרטיות: https://www.openhabfoundation.org/privacy</fdroid_privacy_policy>
     <fdroid_anti_features>תכונות שצריך לשים לב אליהן</fdroid_anti_features>
     <fdroid_anti_features_text>האפליקציה מסומנת בדגל עם הדגל "NonFreeAsset", כי הצלמית של openHAB אינה תחת רישיון חופשי.</fdroid_anti_features_text>
diff --git a/assets/store_descriptions/hu-HU/strings.xml b/assets/store_descriptions/hu-HU/strings.xml
index 36bbc4a71b33a85a759b4021079bd5a13876e802..ce1042b929747b27abd69d57f84cae0650734333 100644
--- a/assets/store_descriptions/hu-HU/strings.xml
+++ b/assets/store_descriptions/hu-HU/strings.xml
@@ -13,7 +13,7 @@ Több mint 200 külön kiegészítő támogatja a márkákat, eszközöket, tech
     <home_entertainment>• Otthoni szórakozás: Samsung TV, LG TV, Sonos, Pioneer AVR, Squeezebox, Kodi, Plex, ...</home_entertainment>
     <security>• Biztonság: ZoneMinder, DSC, ...</security>
     <open_protocols>• Nyitott protokollok: HTTP, TCP/UDP, MQTT, Serial, ...</open_protocols>
-    <special_useCases/>
+    <special_useCases>• Speciális felhasználói lehetőségek: Minecraft, Tesla Car, Időjárási szolgáltatások, ...</special_useCases>
     <empty_point>• ...</empty_point>
 
     <oss_community>Nyílt forráskódú közösség</oss_community>
@@ -27,7 +27,7 @@ Több mint 200 külön kiegészítő támogatja a márkákat, eszközöket, tech
     <oh_server>Szükséged van egy openHAB szerverre, hogy tudd használni ezt az alkalmazást</oh_server>
     <short_description>Szabadgondolkozású technológia, nyílt forráskódú otthonautomatizálás</short_description>
     <fdroid>A F-Droidra készült példány tartalmaz map nézetet is, GCM és hibajelentés el lett belőle távolítva és nem képes push értesítések fogadására az openHAB felhőről.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <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édelem: https://www.openhabfoundation.org/privacy</fdroid_privacy_policy>
     <fdroid_anti_features>Anti funkciók</fdroid_anti_features>
     <fdroid_anti_features_text>Az alkalmazás meg van jelölve a "NonFreeAsset" zászlóval, mert az openHAB ikon nincs szabad licensz alatt.</fdroid_anti_features_text>
diff --git a/assets/store_descriptions/id-ID/strings.xml b/assets/store_descriptions/id-ID/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/id-ID/strings.xml
+++ b/assets/store_descriptions/id-ID/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/it-IT/strings.xml b/assets/store_descriptions/it-IT/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..b2cf2703f1759d314a4d192cd942456187d80c16 100644
--- a/assets/store_descriptions/it-IT/strings.xml
+++ b/assets/store_descriptions/it-IT/strings.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <strings>
-    <intro/>
-    <whatis/>
-    <rules/>
-    <supported/>
-    <bindings>  </bindings>
+    <intro>openHAB - "empowering the smart home" - open source home automation indipendente da tecnologia e produttore</intro>
+    <whatis>openHAB e' una piattaforma open-source basata su java, che integra e combina una vasta gamma di diversi smart home systems e tecnologie in un'unica soluzione.</whatis>
+    <rules>Usando un livello unificato di astrazione, tutti i dispositivi collegati sono disponibili per le regole di automazione e per diverse interfacce utente.</rules>
+    <supported>Prodotti supportati</supported>
+    <bindings>Oltre 200 componenti aggiuntivi forniscono il supporto per marche, dispositivi, tecnologie e protocolli di comunicazione. Esempi sono Z-Wave, Philips Hue, Amazon Eco, Chromecast e Sonos. Scopri tutti i componenti aggiuntivi disponibili, dispositivi supportati e funzionalita' a: https://www.openhab.org/addons/</bindings>
 
-    <home_automation_solutions/>
-    <lighting/>
-    <heating/>
-    <home_entertainment/>
-    <security/>
-    <open_protocols/>
-    <special_useCases/>
-    <empty_point/>
+    <home_automation_solutions>• Soluzioni di domotica: Z-Wave, EnOcean, Netatmo, Homematic, Insteon,...</home_automation_solutions>
+    <lighting>• Illuminazione: Philips Hue, Ikea Trådfri, LIFX, Lutron, Milight,...</lighting>
+    <heating>• Riscaldamento: Max!, nido, Vitotronic, Heatmiser,...</heating>
+    <home_entertainment>• Home Entertainment: TV Samsung, TV LG, Sonos, Pioneer AVR, Squeezebox, Kodi, Plex,...</home_entertainment>
+    <security>• Sicurezza: ZoneMinder, DSC,...</security>
+    <open_protocols>• Protocolli aperti: HTTP, TCP/UDP, MQTT, seriale,...</open_protocols>
+    <special_useCases>• Funzioni speciali: Minecraft, Tesla Car, servizi meteo,...</special_useCases>
+    <empty_point>• ...</empty_point>
 
-    <oss_community/>
-    <forum>  </forum>
+    <oss_community>Comunità Open Source</oss_community>
+    <forum>L'iniziativa OpenHAB open source e' sostenuta dalla sua vivace comunità. Il forum con oltre 13.000 utenti registrati è un posto dove trovare la guida, l'aiuto e l'ispirazione. Partecipa al forum della comunità openHAB a https://community.openhab.org</forum>
 
-    <report_issues/>
-    <translation/>
-    <foundation/>
-    <about_foundation> </about_foundation>
-    <important_note/>
-    <oh_server/>
-    <short_description/>
-    <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
-    <fdroid_privacy_policy/>
-    <fdroid_anti_features/>
-    <fdroid_anti_features_text/>
-    <beta/>
-    <play_beta/>
+    <report_issues>Quando si verifica un problema, segnalalo nel forum o al https://github.com/openhab/openhab-android/issues</report_issues>
+    <translation>Se vuoi aiutare a tradurre l'applicazione nella tua lingua, visita https://crowdin.com/project/openhab-android</translation>
+    <foundation>openHAB Foundation</foundation>
+    <about_foundation>openHAD Foundation e.V. e' una organizzazione nonprofit, con la missione di educare il pubblico sulle possibilita' e benefici di una soluzione domotica libera e aperta. Approfondisci la missione e i servizi della fondazione a https://www.openhabfoundation.org</about_foundation>
+    <important_note>Nota importante</important_note>
+    <oh_server>E' richiesto un server openHAB per questa applicazione</oh_server>
+    <short_description>Soluzione domotica open source e indipendente dalla tecnologia e dai produttori</short_description>
+    <fdroid>Il compilato su F-Droid ha il support map-view, GCM e crash reporting rimosso e non sara' in grado di ricevere notifiche da openHAB cloud.</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</fdroid_privacy_policy>
+    <fdroid_anti_features>Anti Features</fdroid_anti_features>
+    <fdroid_anti_features_text>L'app è contrassegnata con il flag "NonFreeAsset", perché l'icona di openHAB non è licenza libera.</fdroid_anti_features_text>
+    <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>
 </strings>
diff --git a/assets/store_descriptions/ja-JP/strings.xml b/assets/store_descriptions/ja-JP/strings.xml
index ad48e325c2a6a89e2ec7127986bed87957d85971..e2bc0a0151f8cf40decf401aac198e89d2f7965f 100644
--- a/assets/store_descriptions/ja-JP/strings.xml
+++ b/assets/store_descriptions/ja-JP/strings.xml
@@ -26,7 +26,7 @@
     <oh_server>このアプリは openHAB サーバーが必要です</oh_server>
     <short_description/>
     <fdroid>F-Droid のビルドは、マップビューのサポート、GCM、クラッシュレポートが削除されていて openHAB クラウドからプッシュ通知を受信することはできません。</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy>プライバシー ポリシー: https://www.openhabfoundation.org/privacy</fdroid_privacy_policy>
     <fdroid_anti_features>アンチ機能</fdroid_anti_features>
     <fdroid_anti_features_text>openHAB アイコンは自由ライセンスではないので、アプリは"非自由資産"にマークされています。</fdroid_anti_features_text>
diff --git a/assets/store_descriptions/ko-KR/strings.xml b/assets/store_descriptions/ko-KR/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/ko-KR/strings.xml
+++ b/assets/store_descriptions/ko-KR/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/lt-LT/strings.xml b/assets/store_descriptions/lt-LT/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/lt-LT/strings.xml
+++ b/assets/store_descriptions/lt-LT/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/nl-NL/strings.xml b/assets/store_descriptions/nl-NL/strings.xml
index d306516c1f9dd85d505a70598cc6af494e4a5b8f..d773ecd0930d1e962cadac27696d3e5305212666 100644
--- a/assets/store_descriptions/nl-NL/strings.xml
+++ b/assets/store_descriptions/nl-NL/strings.xml
@@ -26,7 +26,7 @@
     <oh_server>U heeft een eigen openHAB server nodig voor deze app</oh_server>
     <short_description/>
     <fdroid>Bij de F-Droid versie is kaartweergave ondersteuning, GCM en crash rapportage verwijderd en de app zal geen push-meldingen kunnen ontvangen van de openHAB Cloud.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/no-NO/strings.xml b/assets/store_descriptions/no-NO/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/no-NO/strings.xml
+++ b/assets/store_descriptions/no-NO/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/pl-PL/strings.xml b/assets/store_descriptions/pl-PL/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/pl-PL/strings.xml
+++ b/assets/store_descriptions/pl-PL/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/pt-BR/strings.xml b/assets/store_descriptions/pt-BR/strings.xml
index 81459ac531b25103d2e26fee9d877a6ae0ab32a3..baa451206a96c2ba46d3e9360041cfaf9f1f2f5f 100644
--- a/assets/store_descriptions/pt-BR/strings.xml
+++ b/assets/store_descriptions/pt-BR/strings.xml
@@ -26,7 +26,7 @@
     <oh_server>É necessário um servidor openHAB para esse aplicativo</oh_server>
     <short_description>Fornecedor e tecnologia agnóstica de código aberto de automação residencial</short_description>
     <fdroid>As compilaçoes de F-Droid possuem suporte à visualização de mapas, GCM e relatórios de erros removidos não serão capazes de receber notificações do openHAB Cloud.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <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</fdroid_privacy_policy>
     <fdroid_anti_features>Anti-recursos</fdroid_anti_features>
     <fdroid_anti_features_text>O aplicativo é sinalizado com o sinalizador "NonFreeAsset", porque o ícone do openHAB não está sob uma licença gratuita.</fdroid_anti_features_text>
diff --git a/assets/store_descriptions/pt-PT/strings.xml b/assets/store_descriptions/pt-PT/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/pt-PT/strings.xml
+++ b/assets/store_descriptions/pt-PT/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/ro-RO/strings.xml b/assets/store_descriptions/ro-RO/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/ro-RO/strings.xml
+++ b/assets/store_descriptions/ro-RO/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/ru-RU/strings.xml b/assets/store_descriptions/ru-RU/strings.xml
index a07a2a01c9f2ddf6052f35deda4f97e6450238ea..f7921a899db2793f31b85eecc88a19888c773fbe 100644
--- a/assets/store_descriptions/ru-RU/strings.xml
+++ b/assets/store_descriptions/ru-RU/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <strings>
-    <intro>openHAB - "Empowering the Smart Home" - открытое ПО для автоматизации "умного дома", не зависящая от производителей и технологий</intro>
-    <whatis>openHAB - это платформа домашней автоматизации с открытым исходным кодом основанная на Java и интегрирующая в себе большое количество систем "умного дома" в единое решение.</whatis>
+    <intro>openHAB - "Empowering the Smart Home" - открытое ПО для автоматизации "умного дома", не зависящее от производителей и технологий</intro>
+    <whatis>openHAB - это платформа домашней автоматизации с открытым исходным кодом, основанная на Java и интегрирующая в себе большое количество систем "умного дома" в единое решение.</whatis>
     <rules>На верхнем уровне абстракции все подключенные устройства доступны для правил автоматизации и различных пользовательских интерфейсов.</rules>
     <supported>Поддерживаемые продукты</supported>
     <bindings>Более 200 надстроек обеспечивают поддержку устройств, технологий и протоколов связи различных производителей. Для примера: Z-Wave, Philips Hue, Amazon Echo, Chromecast и Sonos. Доступные дополнения для устройств и дополнительного функционала можно найти по адресу https://www.openhab.org/addons/</bindings>
@@ -16,7 +16,7 @@
     <empty_point>• ...</empty_point>
 
     <oss_community>Сообщество Open Source</oss_community>
-    <forum>Сообщество openHAB строго придерживается принципов Open Source. Форум, с более чем 13 000 зарегистрированных пользователей, это место, где можно найти рекомендации, помощь и идеи для новых решений. Присоединяйтесь к сообществу openHAB на https://community.openhab.org</forum>
+    <forum>Сообщество openHAB строго придерживается принципов Open Source. Форум, с более чем 13 000 зарегистрированных пользователей - это место, где можно найти рекомендации, помощь и идеи для новых решений. Присоединяйтесь к сообществу openHAB на https://community.openhab.org</forum>
 
     <report_issues>Если вы найдете ошибку, пожалуйста, сообщите об этом на форуме или на https://github.com/openhab/openhab-android/issues</report_issues>
     <translation>Если Вы хотите перевести приложение на свой язык - присоединяйтесь к нам на https://crowdin.com/project/openhab-android</translation>
@@ -26,9 +26,9 @@
     <oh_server>Для этого приложения необходим сервер openHAB</oh_server>
     <short_description>Поставщик технологий с открытым исходным кодом для автоматизации "умного дома"</short_description>
     <fdroid>Версия для F-Droid поддерживает просмотр карт. GCM и отчёты о сбоях удалены. Приложение не будет получать уведомления от openHub Cloud.</fdroid>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[Вы можете установить бета версию параллельно со <a href="https://f-droid.org/packages/org.openhab.habdroid/">стабильной версией</a>.]]></fdroid_beta>
     <fdroid_privacy_policy>Политика конфиденциальности: https://www.openhabfoundation.org/privacy</fdroid_privacy_policy>
-    <fdroid_anti_features/>
+    <fdroid_anti_features>AntiFeatures</fdroid_anti_features>
     <fdroid_anti_features_text>Приложение помечено флагом «NonFreeAsset», поскольку логотип openHAB не является свободно используемым.</fdroid_anti_features_text>
     <beta>Попробуйте новые функции и быстрее оставьте о них отзыв!</beta>
     <play_beta>Вы можете установить бета-версию вместе со стабильной версией.</play_beta>
diff --git a/assets/store_descriptions/sr-SP/strings.xml b/assets/store_descriptions/sr-SP/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/sr-SP/strings.xml
+++ b/assets/store_descriptions/sr-SP/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/sv-SE/strings.xml b/assets/store_descriptions/sv-SE/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/sv-SE/strings.xml
+++ b/assets/store_descriptions/sv-SE/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/tl-PH/strings.xml b/assets/store_descriptions/tl-PH/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/tl-PH/strings.xml
+++ b/assets/store_descriptions/tl-PH/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/tr-TR/strings.xml b/assets/store_descriptions/tr-TR/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/tr-TR/strings.xml
+++ b/assets/store_descriptions/tr-TR/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/uk-UA/strings.xml b/assets/store_descriptions/uk-UA/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/uk-UA/strings.xml
+++ b/assets/store_descriptions/uk-UA/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/vi-VN/strings.xml b/assets/store_descriptions/vi-VN/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/vi-VN/strings.xml
+++ b/assets/store_descriptions/vi-VN/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/yi-DE/strings.xml b/assets/store_descriptions/yi-DE/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/yi-DE/strings.xml
+++ b/assets/store_descriptions/yi-DE/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/assets/store_descriptions/zh-CN/strings.xml b/assets/store_descriptions/zh-CN/strings.xml
index c653a3de3f6f04ce5b40cabe9ea02f59692337ad..3b5e143e6927287c05d28fc987538faa3cbb8284 100644
--- a/assets/store_descriptions/zh-CN/strings.xml
+++ b/assets/store_descriptions/zh-CN/strings.xml
@@ -26,7 +26,7 @@
     <oh_server/>
     <short_description/>
     <fdroid/>
-    <fdroid_beta> <a href=""/></fdroid_beta>
+    <fdroid_beta><![CDATA[]]></fdroid_beta>
     <fdroid_privacy_policy/>
     <fdroid_anti_features/>
     <fdroid_anti_features_text/>
diff --git a/mobile/src/beta/res/values-it/strings.xml b/mobile/src/beta/res/values-it/strings.xml
index 28d0e608ea0239eeba6fa3ef258ac1ba4770a3d6..e6b3da64cc974943f5170297ffe331ea747646cf 100644
--- a/mobile/src/beta/res/values-it/strings.xml
+++ b/mobile/src/beta/res/values-it/strings.xml
@@ -4,4 +4,5 @@
   <!-- Attention translators! Do NOT submit localized strings through GitHub Pull Request. -->
   <!-- See: https://github.com/openhab/openhab-android/blob/master/README.md#localization -->
   <!-- Name used for beta builds -->
+  <string name="app_name">openHAB Beta</string>
 </resources>
diff --git a/mobile/src/foss/res/values-ar/strings.xml b/mobile/src/foss/res/values-ar/strings.xml
index 3f6d3a47278dd6d7186e57d758cab1482f533d87..41e2ea5aadbb69885be27911a850ea9122dce430 100644
--- a/mobile/src/foss/res/values-ar/strings.xml
+++ b/mobile/src/foss/res/values-ar/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">غير متوفر في الإصدار المجاني والمفتوح المصدر</string>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
diff --git a/mobile/src/foss/res/values-cs/strings.xml b/mobile/src/foss/res/values-cs/strings.xml
index 40b8327bcf5aab96b6f14304391ec9f426d86c2f..41e2ea5aadbb69885be27911a850ea9122dce430 100644
--- a/mobile/src/foss/res/values-cs/strings.xml
+++ b/mobile/src/foss/res/values-cs/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">Není k dispozici ve verzi FOSS</string>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
diff --git a/mobile/src/foss/res/values-fr/strings.xml b/mobile/src/foss/res/values-fr/strings.xml
index 5f5cb480159b93a004053c0dc00a6c9ec920ea44..41e2ea5aadbb69885be27911a850ea9122dce430 100644
--- a/mobile/src/foss/res/values-fr/strings.xml
+++ b/mobile/src/foss/res/values-fr/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">Indisponible dans la version FOSS</string>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
diff --git a/mobile/src/foss/res/values-hu/strings.xml b/mobile/src/foss/res/values-hu/strings.xml
index ef6c82a13ce2c73952f806547db42cd6397d394f..296eb1cf8f8f456559f26590a2968ac29cbebe3b 100644
--- a/mobile/src/foss/res/values-hu/strings.xml
+++ b/mobile/src/foss/res/values-hu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">Nem elérhető ebben a vezióban</string>
+  <string name="info_openhab_notification_status_unavailable">Nem érhető el a FOSS változatban</string>
 </resources>
diff --git a/mobile/src/foss/res/values-it/strings.xml b/mobile/src/foss/res/values-it/strings.xml
index 41e2ea5aadbb69885be27911a850ea9122dce430..9ec832e40da765708c4f7745fcf7f37fc91532ad 100644
--- a/mobile/src/foss/res/values-it/strings.xml
+++ b/mobile/src/foss/res/values-it/strings.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+  <string name="info_openhab_notification_status_unavailable">Non disponibile nella versione FOSS</string>
+</resources>
diff --git a/mobile/src/foss/res/values-ja/strings.xml b/mobile/src/foss/res/values-ja/strings.xml
index 2b1a3a649f5d6f14426d56996284195c04e6b501..41e2ea5aadbb69885be27911a850ea9122dce430 100644
--- a/mobile/src/foss/res/values-ja/strings.xml
+++ b/mobile/src/foss/res/values-ja/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">FOSS バージョンでは利用できません</string>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
diff --git a/mobile/src/foss/res/values-nl/strings.xml b/mobile/src/foss/res/values-nl/strings.xml
index 10591cf321543ee06797e2d6ad62c5a4f59fa07d..41e2ea5aadbb69885be27911a850ea9122dce430 100644
--- a/mobile/src/foss/res/values-nl/strings.xml
+++ b/mobile/src/foss/res/values-nl/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">Niet beschikbaar in FOSS-versie</string>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
diff --git a/mobile/src/foss/res/values-ru/strings.xml b/mobile/src/foss/res/values-ru/strings.xml
index 9dbd6287611c5ce10d6769b87e7168f7fd794007..41e2ea5aadbb69885be27911a850ea9122dce430 100644
--- a/mobile/src/foss/res/values-ru/strings.xml
+++ b/mobile/src/foss/res/values-ru/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="info_openhab_notification_status_unavailable">Недоступно в FOSS версии</string>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
diff --git a/mobile/src/full/res/values-cs/strings.xml b/mobile/src/full/res/values-cs/strings.xml
index 384e5be03d5b3f2795b6222f0cc37fc26978da5c..0d40af715d141d75be7f466375e260357b155479 100644
--- a/mobile/src/full/res/values-cs/strings.xml
+++ b/mobile/src/full/res/values-cs/strings.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+  <string name="info_openhab_gcm_no_remote">Nedostupné, vzdálený server není nakonfigurován</string>
+  <string name="info_openhab_gcm_unsupported">Nedostupné, vzdálený server není openHAB cloud</string>
   <string name="info_openhab_gcm_in_progress">Probíhá registrace zařízení</string>
   <string name="info_openhab_gcm_failed">Registrace zařízení se nezdařila</string>
   <string name="info_openhab_gcm_connected">Zařízení úspěšně zaregistrováno u Google Cloud Messaging</string>
+  <string name="notification_channel_default">Výchozí</string>
+  <string name="notification_channel_severity_value">Priorita \"%1$s\"</string>
+  <plurals name="summary_notification_text">
+    <item quantity="one">1 nové oznámení</item>
+    <item quantity="few">%d nová oznámení</item>
+    <item quantity="many">%d nových oznámení</item>
+    <item quantity="other">%d nových oznámení</item>
+  </plurals>
 </resources>
diff --git a/mobile/src/full/res/values-fi/strings.xml b/mobile/src/full/res/values-fi/strings.xml
index a8780500396b93751a2df3fb639e5823b37612be..0d89eeb63dfc205e8f4938e980efa675fb2a64d7 100644
--- a/mobile/src/full/res/values-fi/strings.xml
+++ b/mobile/src/full/res/values-fi/strings.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+  <string name="info_openhab_gcm_no_remote">Ei saatavilla, etäpalvelinta ei ole määritetty</string>
+  <string name="info_openhab_gcm_unsupported">Ei saatavilla, etäpalvelin ei vastaa openHAB pilveä</string>
   <string name="info_openhab_gcm_in_progress">Laitteen rekisteröinti on käynnissä</string>
   <string name="info_openhab_gcm_failed">Laitteen rekisteröinti epäonnistui</string>
   <string name="info_openhab_gcm_connected">Laite rekisteröity onnistuneesti Google Cloud Viestintään (GCM)</string>
+  <string name="notification_channel_default">Oletus</string>
+  <string name="notification_channel_severity_value">Vakavuus \'%1$s\'</string>
+  <plurals name="summary_notification_text">
+    <item quantity="one">1 uusi ilmoitus</item>
+    <item quantity="other">%d uutta ilmoitusta</item>
+  </plurals>
 </resources>
diff --git a/mobile/src/full/res/values-it/strings.xml b/mobile/src/full/res/values-it/strings.xml
index 41e2ea5aadbb69885be27911a850ea9122dce430..8e478f204f19ac2bba64cd6557cd586b6533b8bc 100644
--- a/mobile/src/full/res/values-it/strings.xml
+++ b/mobile/src/full/res/values-it/strings.xml
@@ -1,3 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"></resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+  <string name="info_openhab_gcm_no_remote">Non disponibile, server remoto non configurato</string>
+  <string name="info_openhab_gcm_unsupported">Non disponibile, server remoto non e\' un\'istanza openHAB cloud</string>
+  <string name="info_openhab_gcm_in_progress">Registrazione dispositivo in corso</string>
+  <string name="info_openhab_gcm_failed">Registrazione dispositivo fallita</string>
+  <string name="info_openhab_gcm_connected">Dispositivo registrato con successo con Google Cloud Messaging</string>
+  <string name="notification_channel_default">Predefinito</string>
+  <string name="notification_channel_severity_value">Gravità \'%1$s\'</string>
+  <plurals name="summary_notification_text">
+    <item quantity="one">1 nuova notifica</item>
+    <item quantity="other">%d nuove notifiche</item>
+  </plurals>
+</resources>
diff --git a/mobile/src/full/res/values-nl/strings.xml b/mobile/src/full/res/values-nl/strings.xml
index 56c15516c2a9c6442c9d65d40c7ab2e95ef779eb..4fb5e147fadced7f425a325827dba18aa93db5fa 100644
--- a/mobile/src/full/res/values-nl/strings.xml
+++ b/mobile/src/full/res/values-nl/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+  <string name="info_openhab_gcm_no_remote">Niet beschikbaar, remote-server is niet geconfigureerd</string>
+  <string name="info_openhab_gcm_unsupported">Niet beschikbaar, remote-server is geen openHAB cloud instance</string>
   <string name="info_openhab_gcm_in_progress">Apparaat-registratie is bezig</string>
   <string name="info_openhab_gcm_failed">Apparaat-registratie mislukt</string>
   <string name="info_openhab_gcm_connected">Apparaat registratie bij Google Cloud Messaging gelukt</string>
diff --git a/mobile/src/main/res/values-ar/strings.xml b/mobile/src/main/res/values-ar/strings.xml
index bedb87f394cf20b46c81ceedce8a023d9bdccb4a..664d6707c7aed3ff22942b6654b9f4fc6daede52 100644
--- a/mobile/src/main/res/values-ar/strings.xml
+++ b/mobile/src/main/res/values-ar/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
   <string name="mainmenu_openhab_preferences">إعدادات</string>
-  <string name="mainmenu_openhab_selectsitemap">حدد sitemap الافتراضي</string>
   <string name="mainmenu_openhab_clearcache">إزالة الصور المؤقته</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">اتصال</string>
@@ -22,27 +21,18 @@
   <string name="settings_openhab_username">اسم المستخدم</string>
   <string name="settings_openhab_password">كلمة المرور</string>
   <string name="settings_openhab_sslclientcert">شهادة SSL العميل</string>
-  <string name="settings_openhab_sslclientcert_howto">شهادة SSL العميل الكيفية</string>
   <string name="settings_openhab_sslclientcert_howto_summary">اضغط هنا للحصول على بعض التلميحات والتوضيحات حول كيفية إعداد مصادقة شهادة عميل SSL</string>
   <string name="settings_openhab_screentimeroff">تعطيل عرض المؤقت</string>
   <string name="settings_openhab_screentimeroff_summary">تعطيل عرض إيقاف المؤقت عند تشغيل openHAB</string>
   <string name="settings_openhab_demomode">الوضع التجريبي</string>
   <string name="settings_openhab_demomode_summary">تشغيل في الوضع التجريبي</string>
   <string name="settings_openhab_theme">السمة</string>
-  <string name="settings_openhab_sslcert">تجاهل شهادة SSL</string>
-  <string name="settings_openhab_sslcert_summary">تجاهل تدقيق الشهادة عند مصافحة SSL</string>
-  <string name="settings_openhab_sslhost">تجاهل SSL اسم المضيف</string>
-  <string name="settings_openhab_sslhost_summary">تجاهل التحقق من اسم المضيف أثناء مصافحة SSL</string>
   <string name="settings_openhab_fullscreen">ملء الشاشة</string>
   <string name="settings_openhab_fullscreen_summary">عرض في وضع ملء الشاشة</string>
   <string name="settings_openhab_icon_format">تنسيق الرمز</string>
   <string name="settings_openhab_icon_format_png">صورة نقطية</string>
   <string name="settings_openhab_icon_format_svg">صورة خطية</string>
   <string name="settings_ringtone">نغمة الإشعار</string>
-  <string name="settings_clear_default_sitemap">تصفية sitemap الإفتراضية</string>
-  <string name="settings_no_default_sitemap">لا توجد sitemap إفتراضي محددة</string>
-  <string name="settings_current_default_sitemap">sitemap الافتراضي الحالي: %1$s</string>
-  <string name="settings_openhab_sslsettings">التشفير</string>
   <string name="settings_openhab_alt_connection">بعيد</string>
   <string name="settings_openhab_connection">محلي</string>
   <!-- App messages strings -->
@@ -52,23 +42,13 @@
   <string name="info_conn_url">الاتصال بالعنوان المحلي</string>
   <string name="info_conn_rem_url">الاتصال بالعنوان البعيد</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB يُرجع قائمة sitemap خالية</string>
   <string name="error_network_not_available">شبكة غير متاحة</string>
-  <string name="error_http_connection_failed">اتصال غير ناجح. تم تلقي استجابة غير متوقعة أثناء محاولة الاتصال بخادم openHAB المُعد (رمز استجابة HTTP: %d)</string>
   <string name="error_invalid_url">الرجاء إدخال محدد موقع معلومات صالح في \'http(s)://host(:port)/\' النموذج</string>
   <string name="error_connection_failed">فشل الإتصال بالمضيف</string>
   <string name="error_unable_to_resolve_hostname">غير قادر على معالجة المضيف</string>
   <string name="error_connection_sslhandshake_failed">فشل مصافحة SSL</string>
-  <string name="error_certificate_expired">انتهت مدة صلاحية شهادة SSL. الرجاء الحصول على شهادة جديدة أو تعطيل التحقق من صحة الشهادة أثناء تعارف SSL</string>
-  <string name="error_certificate_revoked">تم إبطال شهادة SSL. الرجاء الحصول على شهادة جديدة أو تعطيل التحقق من صحة الشهادة أثناء تعارف SSL</string>
   <string name="error_certificate_wrong_host">شهادة SSL غير صالح ل %s</string>
-  <string name="error_http_code_401">فشلت المصادقة. الرجاء التحقق من ضبط اسم المستخدم وكلمة المرور أيضا قم بتوفير شهادة عميل SSL (رمز استجابة HTTP 401)</string>
-  <string name="error_http_code_403">فشلت المصادقة. الرجاء التحقق من ضبط اسم المستخدم وكلمة المرور أيضا قم بتوفير شهادة عميل SSL (رمز استجابة HTTP 403)</string>
-  <string name="error_http_code_407">فشلت المصادقة. الرجاء التحقق من ضبط اسم المستخدم وكلمة المرور أيضا قم بتوفير شهادة عميل SSL (رمز استجابة HTTP 407)</string>
-  <string name="error_http_code_414">عنوان URL طويل جداً. الرجاء استخدام عنوان IP أو عنوان URL أقصر (رمز استجابة HTTP 414)</string>
-  <string name="error_http_code_426">HTTPS مطلوب. الرجاء تغيير عنوان URL (رمز استجابة HTTP 426)</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">فشلت المصادقة. الرجاء التحقق من شهادة عميل SSL المتوفرة(رمز استجابة HTTP 495)</string>
   <string name="error_http_code_496">شهادة عميل SSL مطلوبة (رمز استجابة HTTP 496)</string>
   <string name="error_http_code_502">حصل الوكيل العكسي على رد خاطيء من openHAB (رمز استجابة HTTP 502)</string>
   <string name="error_http_code_503">خادم openHAB غير متوفر مؤقتاً (رمز استجابة HTTP 503)</string>
@@ -91,8 +71,6 @@
   <string name="info_not_set">لم يُعين</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">قبول شهادة غير معروفة؟</string>
-  <string name="mtm_decision_always">دائماً</string>
   <string name="mtm_decision_once">مرة</string>
   <string name="mtm_decision_abort">انهاء</string>
   <string name="mtm_notification">التحقق من الشهادة</string>
@@ -125,19 +103,12 @@
   <string name="about_community">مجتمع openHAB</string>
   <string name="about_server">خادم openHAB</string>
   <string name="about_translation">ساعدنا في ترجمة openHAB</string>
-  <string name="settings_debug_messages_summary">سيتم إظهار كلمات المرور في نص واضح!</string>
-  <string name="settings_debug_messages_title">عرض رسائل تصحيح الأخطاء</string>
   <string name="error_couldnt_determine_openhab_url">لا يمكن تحديد عنوان openHAB</string>
   <string name="unknown">غير معروف</string>
   <string name="error_network_type_unsupported">نوع الشبكة (%s) غير مدعوم</string>
   <string name="set">تعيين</string>
   <string name="cancel">إلغاء</string>
   <string name="close">إغلاق</string>
-  <string name="app_intro">مقدمة</string>
-  <string name="intro_welcome">مرحبا في openHAB</string>
-  <string name="intro_whatis">مهما تكن التكنلوجيا والمزود برنامج أتمتة مفتوح المصدر لأجل منزلك</string>
-  <string name="intro_themes">السمات</string>
-  <string name="intro_themes_description">اختار من بين السمات</string>
   <string name="try_again_button">أعد المحاولة</string>
   <string name="go_to_settings_button">اذهب إلى الإعدادات</string>
   <string name="resolving_openhab">يحاول إكتشاف نموذج خادم openHAB \u2026</string>
@@ -153,6 +124,11 @@
   <string name="content_description_open_openhab">افتح openHAB</string>
   <string name="swipe_to_refresh_dismiss">أعي ذلك!</string>
   <!-- Intro strings -->
+  <string name="app_intro">مقدمة</string>
+  <string name="intro_welcome">مرحبا في openHAB</string>
+  <string name="intro_whatis">مهما تكن التكنلوجيا والمزود برنامج أتمتة مفتوح المصدر لأجل منزلك</string>
+  <string name="intro_themes">السمات</string>
+  <string name="intro_themes_description">اختار من بين السمات</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">تخطي</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-cs/strings.xml b/mobile/src/main/res/values-cs/strings.xml
index c221a669a567b10bfc8e0bd15f772b802277239e..56168e4c11ad68a922b3712a0883f0685207c9db 100644
--- a/mobile/src/main/res/values-cs/strings.xml
+++ b/mobile/src/main/res/values-cs/strings.xml
@@ -22,59 +22,71 @@
   <string name="settings_openhab_username">Uživatelské jméno</string>
   <string name="settings_openhab_password">Heslo</string>
   <string name="settings_openhab_sslclientcert">Klientský certifikát SSL</string>
-  <string name="settings_openhab_sslclientcert_howto">Klientský certifikát SSL - jak na to</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Klepnutím sem získáte informace o tom, jak nastavit ověřování klientských certifikátů SSL</string>
   <string name="settings_openhab_screentimeroff">Nezhasínat displej</string>
   <string name="settings_openhab_screentimeroff_summary">Zabránit systému zhasnout automaticky displej pokud je aplikace openHAB spuštěna</string>
   <string name="settings_openhab_demomode">Ukázkový režim</string>
   <string name="settings_openhab_demomode_summary">Spustit v ukázkovém režimu</string>
   <string name="settings_openhab_theme">Motivy vzhledu</string>
-  <string name="settings_openhab_sslcert">Ignorovat certifikát SSL</string>
-  <string name="settings_openhab_sslcert_summary">Ignorovat ověření certifikátu během SSL handshake</string>
-  <string name="settings_openhab_sslhost">Ignorovat SSL hostname</string>
-  <string name="settings_openhab_sslhost_summary">Ignorovat kontrolu hostname během SSL handshake</string>
   <string name="settings_openhab_fullscreen">Na celou obrazovku</string>
   <string name="settings_openhab_fullscreen_summary">Zobrazit v režimu celé obrazovky</string>
   <string name="settings_openhab_icon_format">Formát ikon</string>
   <string name="settings_openhab_icon_format_png">Bitmapa</string>
   <string name="settings_openhab_icon_format_svg">Vektor</string>
-  <string name="settings_clear_default_sitemap">Změnit výchozí sitemap</string>
-  <string name="settings_no_default_sitemap">Žádná výchozí sitemap nebyla vybrána</string>
-  <string name="settings_current_default_sitemap">Aktuální výchozí sitemap: %1$s</string>
-  <string name="settings_openhab_sslsettings">Šifrování</string>
+  <string name="settings_chart_scaling">Měřítko grafu</string>
+  <string name="settings_chart_scaling_summary">Poznámka: Menší měřítko zmenší písmo a šířky čar, takže je více místa pro graf, ale čitelnost písma se může zhoršit.</string>
+  <string name="settings_chart_scaling_value_xs">Velmi malé</string>
+  <string name="settings_chart_scaling_value_s">Malé</string>
+  <string name="settings_chart_scaling_value_m">Výchozí</string>
+  <string name="settings_chart_scaling_value_l">Velké</string>
+  <string name="settings_ringtone">Tón oznámení</string>
+  <string name="settings_clear_default_sitemap">Vymazat výchozí Sitemap</string>
+  <string name="settings_no_default_sitemap">Žádná výchozí Sitemap nebyla vybrána</string>
+  <string name="settings_current_default_sitemap">Aktuální výchozí Sitemap: %1$s</string>
   <string name="settings_openhab_alt_connection">Vzdálený</string>
   <string name="settings_openhab_connection">Lokální</string>
+  <string name="settings_notification_vibration">Vibrace</string>
+  <string name="settings_notification_vibration_off">Vypnuto</string>
+  <string name="settings_notification_vibration_short">Krátce</string>
+  <string name="settings_notification_vibration_long">Dlouze</string>
+  <string name="settings_notification_vibration_twice">Dvakrát</string>
   <!-- App messages strings -->
+  <string name="title_voice_widget">openHAB hlasové příkazy</string>
   <string name="info_voice_input">openHAB, k Vašim službám!</string>
   <string name="info_voice_recognized_text">Rozpoznán příkaz: %1$s</string>
   <string name="info_demo_mode_short">Spuštěno v ukázkovém režimu</string>
   <string name="info_conn_url">Připojuji se k lokální URL</string>
   <string name="info_conn_rem_url">Připojuji se ke vzdálené URL</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB předal prázdný seznam sitemaps</string>
+  <string name="error_empty_sitemap_list">openHAB vrátil prázdný seznam Sitemap</string>
   <string name="error_network_not_available">Síť není k dispozici</string>
-  <string name="error_http_connection_failed">Připojení se nezdařilo. Byla přijata neočekávaná odpověď při pokusu o připojení k serveru openHAB (HTTP kód odpovědi: %d)</string>
+  <string name="error_http_connection_failed">Připojení se nezdařilo. Byla přijata neočekávaná odpověď při pokusu o připojení k serveru openHAB (HTTP kód odpovědi: %d).</string>
   <string name="error_invalid_url">Zadejte platnou adresu URL ve formátu \'http(s)://host(:port) /\'</string>
   <string name="error_connection_failed">Připojení k serveru se nezdařilo</string>
   <string name="error_unable_to_resolve_hostname">Nelze zjistit název hostitele</string>
   <string name="error_connection_sslhandshake_failed">Ověření SSL metodou handshake se nezdařilo</string>
-  <string name="error_certificate_expired">Vypršela platnost certifikátu SSL. Získejte nový certifikát nebo zakažte ověření certifikátu během SSL handshake</string>
-  <string name="error_certificate_revoked">Certifikát SSL byl odvolán. Získejte nový certifikát nebo zakažte ověření certifikátu během SSL handshake</string>
+  <string name="error_certificate_not_trusted">SSL certifikát není důvěryhodný. Importujte kořenový certifikát nebo akceptujte certifikát během SSL handshake.</string>
+  <string name="error_certificate_expired">Vypršela platnost certifikátu SSL. Získejte nový certifikát nebo akceptujte ověření certifikátu během SSL handshake.</string>
+  <string name="error_certificate_not_valid_yet">SSL certifikát ještě není platný. Získejte správný certifikát nebo akceptujte ověření certifikátu během ověření SSL metodou handshake. Také zkontrolujte, jestli je správně nastaven čas na vašem zařízení.</string>
+  <string name="error_certificate_revoked">Certifikát SSL byl odvolán. Získejte nový certifikát nebo akceptujte ověření certifikátu během SSL handshake.</string>
   <string name="error_certificate_wrong_host">Certifikát SSL není platný pro %s</string>
-  <string name="error_http_code_401">Ověření se nezdařilo. Zkontrolujte uživatelské jméno a heslo, případně klientský certifikát SSL (kód odpovědi HTTP 401)</string>
-  <string name="error_http_code_403">Ověření se nezdařilo. Zkontrolujte uživatelské jméno a heslo, případně klientský certifikát SSL (kód odpovědi HTTP 403)</string>
-  <string name="error_http_code_407">Ověření se nezdařilo. Zkontrolujte uživatelské jméno a heslo, případně klientský certifikát SSL (kód odpovědi HTTP 407)</string>
-  <string name="error_http_code_414">Adresa URL je příliš dlouhá. Použijte IP adresu a nebo kratší adresu URL (kód odpovědi HTTP 414)</string>
-  <string name="error_http_code_426">Vyžaduje se HTTPS. Změňte adresu URL (kód odpovědi HTTP 426)</string>
+  <string name="error_http_code_401">Ověření se nezdařilo. Zkontrolujte uživatelské jméno a heslo, případně klientský certifikát SSL (kód odpovědi HTTP 401).</string>
+  <string name="error_http_code_403">Ověření se nezdařilo. Zkontrolujte uživatelské jméno a heslo, případně klientský certifikát SSL (kód odpovědi HTTP 403).</string>
+  <string name="error_http_code_407">Ověření se nezdařilo. Zkontrolujte uživatelské jméno a heslo, případně klientský certifikát SSL (kód odpovědi HTTP 407).</string>
+  <string name="error_http_code_414">Adresa URL je příliš dlouhá. Použijte IP adresu a nebo kratší adresu URL (kód odpovědi HTTP 414).</string>
+  <string name="error_http_code_426">Vyžaduje se HTTPS. Změňte adresu URL (kód odpovědi HTTP 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Ověření se nezdařilo. Zkontrolujte klientský certifikát SSL (kód odpovědi HTTP 495)</string>
+  <string name="error_http_code_495">Ověření se nezdařilo. Zkontrolujte klientský certifikát SSL (kód odpovědi HTTP 495).</string>
   <string name="error_http_code_496">Vyžaduje se SSL certifikát (kód odpovědi HTTP 496)</string>
   <string name="error_http_code_502">Vaše reverse proxy obdržela chybnou odpověď ze serveru openHAB (kód odpovědi HTTP 502)</string>
   <string name="error_http_code_503">Server openHAB je dočasně nedostupný (kód odpovědi HTTP 503)</string>
+  <string name="error_http_code_504">Gateway time-out. Zdá se, že Vaše reverse proxy běží, ale nemůže získat odpověď od serveru openHAB (kód odpovědi HTTP 504).</string>
   <string name="error_http_code_507">Server openHAB má nedostatek volného místa (kód odpovědi HTTP 507)</string>
   <string name="error_http_code_511">Vyžaduje se síťové ověření (kód odpovědi HTTP 511)</string>
   <string name="error_about_no_conn">Chyba při získávání informací ze serveru openHAB</string>
+  <string name="error_openhab_offline">Váš openHAB server je offline, zatímco cloud funguje</string>
   <string name="title_activity_openhabwritetag">Zapsat do NFC tagu</string>
+  <string name="title_activity_libraries">Použité knihovny</string>
   <string name="info_write_tag">Dotkněte se tagu a počkejte na potvrzovací zprávu</string>
   <string name="info_write_tag_progress">Zapisování do tagu</string>
   <string name="info_write_tag_finished">Úspěšně dokončeno</string>
@@ -89,12 +101,22 @@
   <string name="nfc_dialog_title">Zapsat akci do NFC tagu</string>
   <string name="info_not_set">Není nastaveno</string>
   <!-- Notification list strings -->
+  <string name="notification_list_empty">Zatím nebylo zaslané žádné oznámení</string>
+  <string name="notification_list_error">Při načítání oznámení došlo k chybě</string>
+  <string name="list_loading_message">Načítá se\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
-  <string name="mtm_decision_always">Vždy</string>
+  <string name="mtm_accept_cert">Akceptovat neznámý certifikát?</string>
+  <string name="mtm_trust_anchor">Certifikát serveru nebyl podepsán známou certifikační autoritou</string>
+  <string name="mtm_cert_expired">Certifikát serveru vypršel</string>
+  <string name="mtm_accept_servername">Přijmout neodpovídající jméno serveru?</string>
+  <string name="mtm_hostname_mismatch">Server se nemohl prokázat jako \&quot;%s\&quot; Certifikát je platný jen pro:</string>
+  <string name="mtm_connect_anyway">Chcete se i přesto připojit?</string>
+  <string name="mtm_cert_details">Detaily certifikátu:</string>
+  <string name="mtm_decision_always">Přijmout</string>
   <string name="mtm_decision_once">Jednou</string>
   <string name="mtm_decision_abort">Zrušit</string>
   <string name="mtm_notification">Ověření certifikátu</string>
+  <string name="settings_openhab_none">Žádný</string>
   <!-- Themes -->
   <string name="theme_name_light">Světlý</string>
   <string name="theme_name_dark">Tmavý</string>
@@ -109,6 +131,7 @@
   <string name="nfc_action_toggle">Přepnout</string>
   <string name="nfc_activate">Aktivovat</string>
   <string name="nfc_action_current_color">Současná barva</string>
+  <string name="nfc_action_to_sitemap_page">Přejít na stránku Sitemap</string>
   <!-- Drawer -->
   <string name="drawer_open">Boční menu Sitemap vysunuté</string>
   <string name="drawer_close">Boční menu Sitemap zasunuté</string>
@@ -117,6 +140,7 @@
   <string name="about_title">O aplikaci</string>
   <string name="about_license_title">Licence</string>
   <string name="about_changelog">Seznam změn</string>
+  <string name="about_source_code">Zdrojový kód</string>
   <string name="about_issues">Nahlásit problém</string>
   <string name="about_docs">Dokumentace</string>
   <string name="about_community_forum">Komunitní fórum</string>
@@ -124,21 +148,17 @@
   <string name="about_community">komunita openHAB</string>
   <string name="about_server">openHAB server</string>
   <string name="about_translation">Pomozte nám přeložit openHAB</string>
-  <string name="settings_debug_messages_summary">Hesla se zobrazí jako prostý text!</string>
-  <string name="settings_debug_messages_title">Zobrazit zprávy ladění</string>
+  <string name="about_privacy_policy">Ochrana osobních údajů</string>
   <string name="error_couldnt_determine_openhab_url">Nemohu najít URL adresu openHAB</string>
   <string name="unknown">Neznámý</string>
   <string name="error_network_type_unsupported">Typ sítě (%s) není podporován</string>
   <string name="set">Nastavit</string>
   <string name="cancel">Zrušit</string>
   <string name="close">Zavřít</string>
-  <string name="app_intro">Úvod</string>
-  <string name="intro_welcome">Vítejte v openHAB</string>
-  <string name="intro_whatis">Open source program pro domácí automatizaci</string>
-  <string name="intro_themes">Motivy vzhledu</string>
-  <string name="intro_themes_description">Vyberte si mezi několika motivy</string>
   <string name="try_again_button">Zkusit znovu</string>
   <string name="go_to_settings_button">Přejít do nastavení</string>
+  <string name="configuration_missing">Nepodařilo se automaticky nalézt openHAB server. V nastavení serveru nakonfigurujte jeho IP adresu nebo název hostitele.</string>
+  <string name="no_remote_server">Připojení k místní síti je nedostupné a vzdálený server nemáte nastavený</string>
   <string name="resolving_openhab">Hledám openHAB server\u2026</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">Otevřít ovládání rolet</string>
@@ -150,8 +170,17 @@
   <string name="content_description_open_number_picker">Otevřít výběr čísla</string>
   <string name="content_description_video">Video</string>
   <string name="content_description_open_openhab">Spustit openHAB</string>
+  <string name="swipe_to_refresh_description">Aplikace se aktualizuje automaticky, obvykle není třeba to dělat ručně</string>
   <string name="swipe_to_refresh_dismiss">Rozumím!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Úvod</string>
+  <string name="intro_welcome">Vítejte v openHAB</string>
+  <string name="intro_whatis">Open source program pro domácí automatizaci</string>
+  <string name="intro_themes">Motivy vzhledu</string>
+  <string name="intro_themes_description">Vyberte si mezi několika motivy</string>
+  <string name="intro_voice_description">Ovládejte svůj domov hlasem</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">Ovládání Item můžete přiřadit k NFC tagu dlouhým podržením Item</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">PŘESKOČIT</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-de/strings.xml b/mobile/src/main/res/values-de/strings.xml
index 6409b6c5c6de48e36c899a0148234eb65ab77584..fd52e71b655bdba7568ba598eac4a7595146f216 100644
--- a/mobile/src/main/res/values-de/strings.xml
+++ b/mobile/src/main/res/values-de/strings.xml
@@ -22,17 +22,12 @@
   <string name="settings_openhab_username">Benutzername</string>
   <string name="settings_openhab_password">Passwort</string>
   <string name="settings_openhab_sslclientcert">SSL-Client-Zertifikat</string>
-  <string name="settings_openhab_sslclientcert_howto">Erläuterungen zum Client-Zertifikat</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Für Hinweise und Erläuterungen zur SSL-Authentifizierung mittels Client-Zertifikat hier tippen</string>
   <string name="settings_openhab_screentimeroff">Ruhezustand deaktivieren</string>
   <string name="settings_openhab_screentimeroff_summary">Schaltet das automatische Aktivieren des Ruhezustands nach Inaktivität ab, wenn die openHAB-App läuft</string>
   <string name="settings_openhab_demomode">Demomodus</string>
   <string name="settings_openhab_demomode_summary">Demo-Daten an Stelle von realen Server-Daten verwenden</string>
   <string name="settings_openhab_theme">Design</string>
-  <string name="settings_openhab_sslcert">SSL-Zertifikat ignorieren</string>
-  <string name="settings_openhab_sslcert_summary">Beim SSL-Handshake alle Zertifikate unabhängig von ihrer Gültigkeit akzeptieren</string>
-  <string name="settings_openhab_sslhost">SSL-Hostnamen ignorieren</string>
-  <string name="settings_openhab_sslhost_summary">Während des SSL-Handshakes keine Überprüfung des Hostnamens durchführen</string>
   <string name="settings_openhab_fullscreen">Vollbild</string>
   <string name="settings_openhab_fullscreen_summary">Geräte-Statusleiste während der Verwendung der App ausblenden</string>
   <string name="settings_openhab_icon_format">Symbol-Format</string>
@@ -45,10 +40,10 @@
   <string name="settings_chart_scaling_value_m">Standard</string>
   <string name="settings_chart_scaling_value_l">Groß</string>
   <string name="settings_ringtone">Benachrichtigungston</string>
+  <string name="settings_ringtone_none">Keiner</string>
   <string name="settings_clear_default_sitemap">Standard-Sitemap zurücksetzen</string>
   <string name="settings_no_default_sitemap">Keine Standard-Sitemap festgelegt</string>
   <string name="settings_current_default_sitemap">Aktuelle Standard-Sitemap: %1$s</string>
-  <string name="settings_openhab_sslsettings">Verschlüsselung</string>
   <string name="settings_openhab_alt_connection">Fernzugriff</string>
   <string name="settings_openhab_connection">Lokal</string>
   <string name="settings_notification_vibration">Benachrichtigungsvibration</string>
@@ -56,6 +51,8 @@
   <string name="settings_notification_vibration_short">Kurz</string>
   <string name="settings_notification_vibration_long">Lang</string>
   <string name="settings_notification_vibration_twice">Zweimal</string>
+  <string name="settings_connection_summary">Verbunden mit %s</string>
+  <string name="settings_insecure_connection_summary">Unsicher verbunden mit %s</string>
   <!-- App messages strings -->
   <string name="title_voice_widget">openHAB-Sprachbefehle</string>
   <string name="info_voice_input">openHAB, zu Ihren Diensten!</string>
@@ -66,30 +63,31 @@
   <!-- Error messages -->
   <string name="error_empty_sitemap_list">openHAB lieferte eine leere Sitemap-Liste</string>
   <string name="error_network_not_available">Netzwerk nicht verfügbar</string>
-  <string name="error_http_connection_failed">Verbindung fehlgeschlagen. Es wurde eine unerwartete Antwort während des Verbindungsversuches mit dem konfigurierten openHAB-Server empfangen. (HTTP Statuscode: %d)</string>
+  <string name="error_http_connection_failed">Verbindung fehlgeschlagen. Es wurde eine unerwartete Antwort während des Verbindungsversuches mit dem konfigurierten openHAB-Server empfangen. (HTTP Statuscode: %d).</string>
   <string name="error_invalid_url">Bitte geben Sie eine gültige URL im Format \'http(s)://Adresse(:Port)/\' an</string>
   <string name="error_connection_failed">Verbindung fehlgeschlagen</string>
   <string name="error_unable_to_resolve_hostname">Fehler beim Auflösen des Hostnamens</string>
   <string name="error_connection_sslhandshake_failed">SSL-Handshake fehlgeschlagen</string>
-  <string name="error_certificate_not_trusted">SSL-Zertifikat nicht vertrauenswürdig. Bitte importieren Sie das Root-Zertifikat oder deaktivieren Sie die Zertifikatsvalidierung</string>
-  <string name="error_certificate_expired">SSL-Zertifikat abgelaufen. Bitte erstellen Sie ein neues Zertifikat oder deaktivieren Sie die Zertifikatsvalidierung</string>
-  <string name="error_certificate_not_valid_yet">SSL-Zertifikat noch nicht gültig. Bitte erstellen Sie ein gültiges Zertifikat oder deaktivieren Sie die Zertifikatsvalidierung. Überprüfen Sie auch die auf Ihrem Gerät eingestellte Uhrzeit</string>
-  <string name="error_certificate_revoked">SSL-Zertifikat widerrufen. Bitte erstellen Sie ein neues Zertifikat oder deaktivieren Sie die Zertifikatsvalidierung</string>
+  <string name="error_certificate_not_trusted">Das SSL-Zertifikat ist nicht vertrauenswürdig. Bitte importieren Sie das Root-Zertifikat oder akzeptieren Sie das Zertifakt während des Verbindungsaufbaus.</string>
+  <string name="error_certificate_expired">SSL-Zertifikat abgelaufen. Bitte erstellen Sie ein neues Zertifikat oder akzeptieren Sie das Zertifakt während des Verbindungsaufbaus.</string>
+  <string name="error_certificate_not_valid_yet">SSL-Zertifikat noch nicht gültig. Bitte erstellen Sie ein gültiges Zertifikat oder akzeptieren Sie das Zertifakt während des Verbindungsaufbaus. Überprüfen Sie auch die auf Ihrem Gerät eingestellte Uhrzeit.</string>
+  <string name="error_certificate_revoked">SSL-Zertifikat widerrufen. Bitte erstellen Sie ein neues Zertifikat oder akzeptieren Sie das Zertifakt während des Verbindungsaufbaus.</string>
   <string name="error_certificate_wrong_host">Das Zertifikat ist nicht gültig für %s</string>
-  <string name="error_http_code_401">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie den konfigurierten Nutzer und das Passwort bzw. das bereitgestellte SSL-Client-Zertifikat (HTTP-Statuscode 401)</string>
-  <string name="error_http_code_403">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie den konfigurierten Nutzer und das Passwort bzw. das bereitgestellte SSL-Client-Zertifikat (HTTP-Statuscode 403)</string>
-  <string name="error_http_code_407">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie den konfigurierten Nutzer und das Passwort bzw. das bereitgestellte SSL-Client-Zertifikat (HTTP-Statuscode 407)</string>
-  <string name="error_http_code_414">URL ist zu lang. Bitte verwenden Sie die IP-Adresse oder eine kürzere URL (HTTP-Statuscode 414)</string>
-  <string name="error_http_code_426">HTTPS wird gefordert. Bitte ändern Sie die openHAB-URL (HTTP-Statuscode 426)</string>
+  <string name="error_http_code_401">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie den konfigurierten Nutzer und das Passwort bzw. das bereitgestellte SSL-Client-Zertifikat (HTTP-Statuscode 401).</string>
+  <string name="error_http_code_403">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie den konfigurierten Nutzer und das Passwort bzw. das bereitgestellte SSL-Client-Zertifikat (HTTP-Statuscode 403).</string>
+  <string name="error_http_code_407">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie den konfigurierten Nutzer und das Passwort bzw. das bereitgestellte SSL-Client-Zertifikat (HTTP-Statuscode 407).</string>
+  <string name="error_http_code_414">URL ist zu lang. Bitte verwenden Sie die IP-Adresse oder eine kürzere URL (HTTP-Statuscode 414).</string>
+  <string name="error_http_code_426">HTTPS wird gefordert. Bitte ändern Sie die openHAB-URL (HTTP-Statuscode 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie das bereitgestellte SSL Client-Zertifikat (HTTP-Statuscode 495)</string>
+  <string name="error_http_code_495">Authentifizierung fehlgeschlagen. Bitte überprüfen Sie das bereitgestellte SSL Client-Zertifikat (HTTP-Statuscode 495).</string>
   <string name="error_http_code_496">Client-Zertifikat wird gefordert (HTTP-Statuscode 496)</string>
   <string name="error_http_code_502">Ihr Reverse-Proxy bekam eine ungültige Antwort vom openHAB-Server (HTTP-Statuscode 502)</string>
   <string name="error_http_code_503">Der openHAB-Server steht temporär nicht zur Verfügung (HTTP-Statuscode 503)</string>
-  <string name="error_http_code_504">Gateway Time-out. Ihr Reverse-Proxy läuft, aber bekam keine Antwort vom openHAB-Server (HTTP-Statuscode 504)</string>
+  <string name="error_http_code_504">Gateway Time-out. Ihr Reverse-Proxy läuft, aber bekam keine Antwort vom openHAB-Server (HTTP-Statuscode 504).</string>
   <string name="error_http_code_507">Der openHAB-Server hat nicht genug freien Speicher (HTTP-Statuscode 507)</string>
   <string name="error_http_code_511">Netzwerkauthentifizierung wird gefordert (HTTP-Statuscode 511)</string>
   <string name="error_about_no_conn">Fehler beim Abrufen der openHAB-Server-Informationen</string>
+  <string name="error_openhab_offline">Die openHAB-Cloud-Instanz funktioniert, aber Ihr openHAB-Server ist offline</string>
   <string name="title_activity_openhabwritetag">NFC-Tag beschreiben</string>
   <string name="title_activity_libraries">Verwendete Bibliotheken</string>
   <string name="info_write_tag">Berühren Sie den NFC-Tag und warten Sie auf die Bestätigungsmitteilung</string>
@@ -111,7 +109,13 @@
   <string name="list_loading_message">Wird geladen\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
   <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
-  <string name="mtm_decision_always">Immer</string>
+  <string name="mtm_trust_anchor">Das Serverzertifikat wurde nicht von einer bekannten Zertifizierungsstelle signiert</string>
+  <string name="mtm_cert_expired">Das Serverzertifikat ist abgelaufen</string>
+  <string name="mtm_accept_servername">Nicht übereinstimmenden Servernamen akzeptieren?</string>
+  <string name="mtm_hostname_mismatch">Server konnte sich nicht als \&quot;%s\&quot; authentifizieren. Das Zertifikat ist nur gültig für:</string>
+  <string name="mtm_connect_anyway">Möchtest du trotzdem eine Verbindung herstellen?</string>
+  <string name="mtm_cert_details">Zertifikatdetails:</string>
+  <string name="mtm_decision_always">Akzeptieren</string>
   <string name="mtm_decision_once">Einmalig</string>
   <string name="mtm_decision_abort">Abbrechen</string>
   <string name="mtm_notification">Unbekanntes Zertifikat</string>
@@ -148,22 +152,17 @@
   <string name="about_server">openHAB-Server</string>
   <string name="about_translation">Helfen Sie uns bei der Übersetzung von openHAB</string>
   <string name="about_privacy_policy">Datenschutzerklärung</string>
-  <string name="settings_debug_messages_summary">Passwörter werden in Klartext angezeigt!</string>
-  <string name="settings_debug_messages_title">Debug-Meldungen anzeigen</string>
+  <string name="settings_debug_messages_title">Zeige Informationen zur Fehlerbehebung</string>
   <string name="error_couldnt_determine_openhab_url">Konnte openHAB-URL nicht ermitteln</string>
   <string name="unknown">Unbekannt</string>
   <string name="error_network_type_unsupported">Netzwerktyp (%s) wird nicht unterstützt</string>
   <string name="set">Setzen</string>
   <string name="cancel">Abbrechen</string>
   <string name="close">Schließen</string>
-  <string name="app_intro">Einführung</string>
-  <string name="intro_welcome">Willkommen bei openHAB</string>
-  <string name="intro_whatis">Eine technologie- und herstellerunabhängige, quelloffene Automatisierungslösung für Ihr Zuhause</string>
-  <string name="intro_themes">Designs</string>
-  <string name="intro_themes_description">Wählen Sie zwischen verschiedenen Designs</string>
   <string name="try_again_button">Erneut versuchen</string>
   <string name="go_to_settings_button">Einstellungen öffnen</string>
   <string name="configuration_missing">Ihr openHAB-Server konnte nicht automatisch ermittelt werden. Konfigurieren Sie in den Servereinstellungen die IP-Adresse oder den Host-Namen.</string>
+  <string name="no_remote_server">Lokales Netzwerk ist nicht verfügbar und Sie haben keinen Server für den Fernzugriff konfiguriert</string>
   <string name="resolving_openhab">Versuche openHAB-Server-Instanz zu finden\u2026</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">Rollladen öffnen</string>
@@ -178,11 +177,16 @@
   <string name="swipe_to_refresh_description">Die Inhalte werden automatisch aktualisiert, Sie müssen das normalerweise nicht manuell tun</string>
   <string name="swipe_to_refresh_dismiss">Verstanden!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Einführung</string>
+  <string name="intro_welcome">Willkommen bei openHAB</string>
+  <string name="intro_whatis">Eine technologie- und herstellerunabhängige, quelloffene Automatisierungslösung für Ihr Zuhause</string>
+  <string name="intro_themes">Designs</string>
+  <string name="intro_themes_description">Wählen Sie zwischen verschiedenen Designs</string>
+  <string name="intro_voice_description">Steuern Sie Ihr Zuhause mit Ihrer Stimme</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">Die Steuerung eines Items kann durch langes Tippen des Items an NFC-Tags gebunden werden</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">ÜBERSPRINGEN</string>
   <!-- Intro "DONE" button -->
   <string name="app_intro_done_button">FERTIG</string>
-  <string name="intro_voice_description">Steuern Sie Ihr Zuhause mit Ihrer Stimme</string>
-  <string name="intro_nfc">NFC</string>
-  <string name="intro_nfc_description">Die Steuerung eines Items kann durch langes Tippen des Items an NFC-Tags gebunden werden</string>
 </resources>
diff --git a/mobile/src/main/res/values-el/strings.xml b/mobile/src/main/res/values-el/strings.xml
index 36aa42dc6c09caf1fda6e7e7c638786440b40060..441e1047fc779d78280d004adf0630d76d01d2c8 100644
--- a/mobile/src/main/res/values-el/strings.xml
+++ b/mobile/src/main/res/values-el/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Χάρτες Χώρου</string>
   <string name="mainmenu_openhab_preferences">Ρυθμίσεις</string>
-  <string name="mainmenu_openhab_selectsitemap">Προκαθορισμένο Sitemap</string>
   <string name="mainmenu_openhab_clearcache">Καθάρισμα κρυφής μνήμης</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">Σύνδεση</string>
@@ -22,26 +21,17 @@
   <string name="settings_openhab_username">Όνομα χρήστη</string>
   <string name="settings_openhab_password">Κωδικός</string>
   <string name="settings_openhab_sslclientcert">Πιστοποιητικό SSL πελάτη</string>
-  <string name="settings_openhab_sslclientcert_howto">Πιστοποιητικό SSL πελάτη πώς-να</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Πατήστε εδώ για να ενημερωθείτε για το πως θα ορίσετε πιστοποίηση με πιστοποιητικό SSL πελάτη</string>
   <string name="settings_openhab_screentimeroff">Απενεργοποίηση αδρανοποίησης</string>
   <string name="settings_openhab_screentimeroff_summary">Απενεργοποίηση σβησίματος οθόνης όταν τρέχει το openHAB</string>
   <string name="settings_openhab_demomode">Κατάσταση επίδειξης</string>
   <string name="settings_openhab_demomode_summary">Εκτέλεση σε κατάσταση επίδειξης</string>
   <string name="settings_openhab_theme">Θέμα</string>
-  <string name="settings_openhab_sslcert">Αγνόηση πιστοποιητικού SSL</string>
-  <string name="settings_openhab_sslcert_summary">Αγνόηση της επικύρωσης του πιστοποιητικού κατά την διαδικασία SSL Handshake</string>
-  <string name="settings_openhab_sslhost">Αγνόηση ονόματος διακομιστή SSL</string>
-  <string name="settings_openhab_sslhost_summary">Αγνόηση του ελέγχου ονόματος διακομιστή κατά την διαδικασία SSL Handshake</string>
   <string name="settings_openhab_fullscreen">Πλήρης Οθόνη</string>
   <string name="settings_openhab_fullscreen_summary">Προβολή σε πλήρη οθόνη</string>
   <string name="settings_openhab_icon_format">Μορφή εικονιδίου</string>
   <string name="settings_openhab_icon_format_png">Bitmap</string>
   <string name="settings_openhab_icon_format_svg">Διάνυσμα</string>
-  <string name="settings_clear_default_sitemap">Καθαρισμός προκαθορισμένου sitemap</string>
-  <string name="settings_no_default_sitemap">Δεν έχει επιλεγεί προκαθορισμένο sitemap</string>
-  <string name="settings_current_default_sitemap">Τρέχον προκαθορισμένο sitemap: %1$s</string>
-  <string name="settings_openhab_sslsettings">Κρυπτογράφηση</string>
   <string name="settings_openhab_alt_connection">Απομακρυσμένo</string>
   <string name="settings_openhab_connection">Τοπικό</string>
   <!-- App messages strings -->
@@ -51,23 +41,13 @@
   <string name="info_conn_url">Σύνδεση στην τοπική διεύθυνση</string>
   <string name="info_conn_rem_url">Σύνδεση στην απομακρυσμένη διεύθυνση</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">Το openHAB επέστρεψε μια άδεια λίστα χαρτών χώρου</string>
   <string name="error_network_not_available">Το δίκτυο δεν είναι διαθέσιμο</string>
-  <string name="error_http_connection_failed">Η σύνδεση απέτυχε. Λήψη μη αναμενόμενης απάντησης κατά την προσπάθεια σύνδεσης με το διακομιστή openHAB (κωδικός απόκρισης HTTP: %d)</string>
   <string name="error_invalid_url">Παρακαλώ εισάγετε ενα σωστό URL της μορφής \'πρωτόκολλο://διακομιστής:πόρτα/\'</string>
   <string name="error_connection_failed">Η σύνδεση στον διακομιστή απέτυχε</string>
   <string name="error_unable_to_resolve_hostname">Αδυναμία ανεύρεσης ονόματος διακομιστή</string>
   <string name="error_connection_sslhandshake_failed">Η διαδικασία SSL Handshake απέτυχε</string>
-  <string name="error_certificate_expired">Το πιστοποιητικό SSL έχει λήξει. Παρακαλώ λάβετε καινούριο πιστοποιητικό ή απενεργοποιήστε τον έλεγχο του πιστοποιητικού κατά την διάρκεια της διαδικασίας εγκαθίδρυσης SSL.</string>
-  <string name="error_certificate_revoked">Το πιστοποιητικό SSL έχει ανακληθεί. Παρακαλώ λάβετε καινούριο πιστοποιητικό ή απενεργοποιήστε τον έλεγχο του πιστοποιητικού κατά την διάρκεια της διαδικασίας εγκαθίδρυσης SSL.</string>
   <string name="error_certificate_wrong_host">Το πιστοποιητικό SSL δεν είναι έγκυρο για %s</string>
-  <string name="error_http_code_401">Η πιστοποίηση του χρήστη απέτυχε. Παρακαλώ ελέγξτε το όνομα χρήστη, κωδικό και SSL πιστοποιητικό πελάτη (κωδικός απόκρισης HTTP 401)</string>
-  <string name="error_http_code_403">Η πιστοποίηση του χρήστη απέτυχε. Παρακαλώ ελέγξτε το όνομα χρήστη, κωδικό και SSL πιστοποιητικό πελάτη (κωδικός απόκρισης HTTP 403)</string>
-  <string name="error_http_code_407">Η πιστοποίηση του χρήστη απέτυχε. Παρακαλώ ελέγξτε το όνομα χρήστη, κωδικό και SSL πιστοποιητικό πελάτη (κωδικός απόκρισης HTTP 407)</string>
-  <string name="error_http_code_414">Το URL είναι πολύ μακρύ. Παρακαλώ χρησιμοποιήστε το IP ή ένα πιο μικρό URL (κωδικός απόκρισης HTTP 414)</string>
-  <string name="error_http_code_426">Απαιτείται χρήση HTTPS. Παρακαλώ αλλάξτε το URL (κωδικός απόκρισης HTTP 426)</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Η πιστοποίηση του χρήστη απέτυχε. Παρακαλώ ελέγξτε το SSL πιστοποιητικό πελάτη (κωδικός απόκρισης HTTP 495)</string>
   <string name="error_http_code_496">Απαιτείται SSL πιστοποιητικό πελάτη (κωδικός απόκρισης HTTP 496)</string>
   <string name="error_http_code_502">Ο reverse proxy σας έλαβε λάθος απάντηση από το openHAB (κωδικός απόκρισης HTTP 502)</string>
   <string name="error_http_code_503">Το openHAB είναι προσωρινά μη διαθέσιμο (κωδικός απόκρισης HTTP 503)</string>
@@ -90,8 +70,6 @@
   <string name="info_not_set">Δεν έχει ρυθμιστεί</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Αποδοχή άγνωστου πιστοποιητικού;</string>
-  <string name="mtm_decision_always">Πάντα</string>
   <string name="mtm_decision_once">Μία φορά</string>
   <string name="mtm_decision_abort">Διακοπή</string>
   <string name="mtm_notification">Επιβεβαίωση πιστοποιητικού</string>
@@ -124,19 +102,12 @@
   <string name="about_community">Κοινότητα openHAB</string>
   <string name="about_server">Διακομιστής openHAB</string>
   <string name="about_translation">Βοηθείστε μας να μεταφράσουμε το openHAB</string>
-  <string name="settings_debug_messages_summary">Οι κωδικοί θα εμφανιστούν σε απλό κείμενο!</string>
-  <string name="settings_debug_messages_title">Προβολή μηνυμάτων αποσφαλμάτωσης</string>
   <string name="error_couldnt_determine_openhab_url">Αδυναμία προσδιορισμού του openHAB URL</string>
   <string name="unknown">Άγνωστο</string>
   <string name="error_network_type_unsupported">Ο τύπος δικτύου (%s) δεν υποστηρίζεται</string>
   <string name="set">Ορισμός</string>
   <string name="cancel">Άκυρο</string>
   <string name="close">Κλείσιμο</string>
-  <string name="app_intro">Εισαγωγή</string>
-  <string name="intro_welcome">Καλώς ήρθατε στο openHAB</string>
-  <string name="intro_whatis">Λογισμικό ανοιχτού κώδικα αυτοματοποίησης, ανεξάρτητο κατασκευαστή και τεχνολογίας, για το σπίτι σας.</string>
-  <string name="intro_themes">Θέματα</string>
-  <string name="intro_themes_description">Επιλέξτε μεταξύ διαφόρων θεμάτων</string>
   <string name="try_again_button">Προσπαθήστε ξανά</string>
   <string name="go_to_settings_button">Μετάβαση στις ρυθμίσεις</string>
   <string name="resolving_openhab">Προσπάθεια εύρεσης του διακομιστή openHAB</string>
@@ -152,6 +123,11 @@
   <string name="content_description_open_openhab">Άνοιγμα openHAB</string>
   <string name="swipe_to_refresh_dismiss">Το κατάλαβα!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Εισαγωγή</string>
+  <string name="intro_welcome">Καλώς ήρθατε στο openHAB</string>
+  <string name="intro_whatis">Λογισμικό ανοιχτού κώδικα αυτοματοποίησης, ανεξάρτητο κατασκευαστή και τεχνολογίας, για το σπίτι σας.</string>
+  <string name="intro_themes">Θέματα</string>
+  <string name="intro_themes_description">Επιλέξτε μεταξύ διαφόρων θεμάτων</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">ΠΑΡΑΛΕΙΨΗ</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
index 398a8694db6967085376d885fab85837981d20d2..204ab2027e8eef6ff373edbc6b50d67a55eb3040 100644
--- a/mobile/src/main/res/values-es/strings.xml
+++ b/mobile/src/main/res/values-es/strings.xml
@@ -9,22 +9,16 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
   <string name="mainmenu_openhab_preferences">Configuración</string>
-  <string name="mainmenu_openhab_selectsitemap">Seleccionar el sitemap por defecto</string>
   <string name="mainmenu_openhab_clearcache">Borrar la caché de imágenes</string>
   <!-- App settings strings -->
   <string name="settings_openhab_username">Nombre de usuario</string>
   <string name="settings_openhab_password">Contraseña</string>
   <string name="settings_openhab_sslclientcert">Certificado de cliente SSL</string>
-  <string name="settings_openhab_sslclientcert_howto">Certificado de cliente SSL how-to</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Clic aquí para obtener sugerencias y explicaciones sobre cómo configurar la autenticación del certificado de cliente SSL</string>
   <string name="settings_openhab_screentimeroff">Deshabilitar apagado de pantalla</string>
   <string name="settings_openhab_screentimeroff_summary">Deshabilita el temporizador que apaga la pantalla mientras se está ejecutando</string>
   <string name="settings_openhab_demomode">Modo demo</string>
   <string name="settings_openhab_demomode_summary">Ejecutar openHAB App modo demo</string>
-  <string name="settings_openhab_sslcert">Ignorar certificado SSL</string>
-  <string name="settings_openhab_sslcert_summary">No comprobar el certificado durante la conexión SSL</string>
-  <string name="settings_openhab_sslhost">Ignorar dominio SSL</string>
-  <string name="settings_openhab_sslhost_summary">No comprobar el nombre de dominio durante la conexión SSL</string>
   <string name="settings_openhab_fullscreen_summary">Mostrar a pantalla completa</string>
   <string name="settings_openhab_icon_format">Formato de los iconos</string>
   <!-- App messages strings -->
@@ -34,12 +28,9 @@
   <string name="info_conn_url">Conectando a la URL local</string>
   <string name="info_conn_rem_url">Conectando a la URL remota</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB devolvió una lista de sitemaps vacía</string>
   <string name="error_network_not_available">La conexión de red no está disponible</string>
   <string name="error_connection_failed">Ha fallado la conexión con el host</string>
   <string name="error_unable_to_resolve_hostname">No se puede resolver el nombre de host</string>
-  <string name="error_certificate_expired">El certificado SSL ha caducado. Por favor, obtén un nuevo certificado o deshabilita la validación del certificado durante la negociación SSL</string>
-  <string name="error_certificate_revoked">El certificado SSL ha sido revocado. Por favor, obtén un nuevo certificado o deshabilita la validación del certificado durante la negociación SSL</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
   <string name="error_http_code_496">SSL client certificate is required (Código de respuesta HTTP 496)</string>
   <string name="error_http_code_511">Se requiere autenticación de red (Código de respuesta HTTP 511)</string>
@@ -55,8 +46,6 @@
   <string name="info_not_set">Sin establecer</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Aceptar este certificado desconocido?</string>
-  <string name="mtm_decision_always">Siempre</string>
   <string name="mtm_decision_once">Una vez</string>
   <string name="mtm_decision_abort">Cancelar</string>
   <string name="mtm_notification">Validación del certificado</string>
@@ -69,18 +58,17 @@
   <!-- About -->
   <string name="about_title">Acerca de</string>
   <string name="about_license_title">Licencia</string>
-  <string name="settings_debug_messages_title">Mostrar mensajes de depuración</string>
   <string name="error_couldnt_determine_openhab_url">No se pudo determinar la URL de openHAB</string>
   <string name="unknown">Desconocido</string>
   <string name="error_network_type_unsupported">El tipo de red (%s) no está soportado</string>
   <string name="set">Establecer</string>
   <string name="cancel">Cancelar</string>
+  <!-- Content description for images -->
+  <!-- Intro strings -->
   <string name="intro_welcome">Bienvenido a openHAB</string>
   <string name="intro_whatis">Software de automatización de código abierto para tu hogar sin importar vendedores ni tecnologías</string>
   <string name="intro_themes">Temas</string>
   <string name="intro_themes_description">Elegir entre varios temas</string>
-  <!-- Content description for images -->
-  <!-- Intro strings -->
   <!-- Intro "SKIP" button -->
   <!-- Intro "DONE" button -->
 </resources>
diff --git a/mobile/src/main/res/values-fi/strings.xml b/mobile/src/main/res/values-fi/strings.xml
index 98e117687bc65b42086af810ae7ee939bbeabb20..31956180fc3dfe4590584a4743bdd7afcb34e08b 100644
--- a/mobile/src/main/res/values-fi/strings.xml
+++ b/mobile/src/main/res/values-fi/strings.xml
@@ -9,7 +9,7 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Sivukartat</string>
   <string name="mainmenu_openhab_preferences">Asetukset</string>
-  <string name="mainmenu_openhab_selectsitemap">Valitse sivukartta oletukseksi</string>
+  <string name="mainmenu_openhab_selectsitemap">Valitse oletussivukartta</string>
   <string name="mainmenu_openhab_clearcache">Tyhjennä kuvien välimuisti</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">Yhteys</string>
@@ -22,29 +22,39 @@
   <string name="settings_openhab_username">Käyttäjänimi</string>
   <string name="settings_openhab_password">Salasana</string>
   <string name="settings_openhab_sslclientcert">Asiakkaan SSL sertifikaatti</string>
-  <string name="settings_openhab_sslclientcert_howto">Asiakkaan SSL sertifikaatti -opas</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Näpäytä tästä nähdäksesi muutamia vinkkejä ja ohjeita kuinka asennat asiakkaan SSL todennuksen</string>
   <string name="settings_openhab_screentimeroff">Poista näytön sammutuksen ajastin</string>
   <string name="settings_openhab_screentimeroff_summary">Näytön sammutuksen ajastin pois päältä openHABin ollessa käynnissä</string>
   <string name="settings_openhab_demomode">Esittelytila</string>
   <string name="settings_openhab_demomode_summary">Käytä esittelytilassa</string>
   <string name="settings_openhab_theme">Teema</string>
-  <string name="settings_openhab_sslcert">Älä huomioi SSL sertifikaattia</string>
-  <string name="settings_openhab_sslcert_summary">Hylkää sertifikaatin vahvistaminen SSL kättelyn aikana</string>
-  <string name="settings_openhab_sslhost">Älä huomioi SSL isäntänimeä</string>
-  <string name="settings_openhab_sslhost_summary">Hylkää isäntänimen tarkastus SSL kättelyn aikana</string>
   <string name="settings_openhab_fullscreen">Kokonäyttö</string>
   <string name="settings_openhab_fullscreen_summary">Näytä koko näytöllä</string>
   <string name="settings_openhab_icon_format">Kuvakkeiden tallennusmuoto</string>
   <string name="settings_openhab_icon_format_png">Bitmap</string>
   <string name="settings_openhab_icon_format_svg">SVG</string>
+  <string name="settings_chart_scaling">Kuvaajan skaalaus</string>
+  <string name="settings_chart_scaling_summary">Huomautus: Pienempi skaalaus kutistaa fontit ja viivojen leveyden. Kuvaajalle on näin enemmän tilaa, mutta fonttien luettavuus voi kärsiä.</string>
+  <string name="settings_chart_scaling_value_xs">Hyvin pieni</string>
+  <string name="settings_chart_scaling_value_s">Pieni</string>
+  <string name="settings_chart_scaling_value_m">Oletus</string>
+  <string name="settings_chart_scaling_value_l">Suuri</string>
+  <string name="settings_ringtone">Ilmoituksen merkkiääni</string>
+  <string name="settings_ringtone_none">Ei mikään</string>
   <string name="settings_clear_default_sitemap">Poista oletussivukartta</string>
   <string name="settings_no_default_sitemap">Ei sivukarttaa oletuksena</string>
   <string name="settings_current_default_sitemap">Nykyinen oletussivukartta: %1$s</string>
-  <string name="settings_openhab_sslsettings">Salaus</string>
   <string name="settings_openhab_alt_connection">Etäkäyttö</string>
   <string name="settings_openhab_connection">Paikalliskäyttö</string>
+  <string name="settings_notification_vibration">Ilmoituksen värinä</string>
+  <string name="settings_notification_vibration_off">Pois päältä</string>
+  <string name="settings_notification_vibration_short">Lyhyt</string>
+  <string name="settings_notification_vibration_long">Pitkä</string>
+  <string name="settings_notification_vibration_twice">Kaksi kertaa</string>
+  <string name="settings_connection_summary">Yhdistetty kohteeseen %s</string>
+  <string name="settings_insecure_connection_summary">Turvattomasti yhdistetty kohteeseen %s</string>
   <!-- App messages strings -->
+  <string name="title_voice_widget">openHAB äänikomennot</string>
   <string name="info_voice_input">openHAB, komennossasi!</string>
   <string name="info_voice_recognized_text">Tunnistettu komento: %1$s</string>
   <string name="info_demo_mode_short">Sovellus esittelytilassa</string>
@@ -53,28 +63,33 @@
   <!-- Error messages -->
   <string name="error_empty_sitemap_list">openHAB palautti tyhjän sivukarttojen luettelon</string>
   <string name="error_network_not_available">Verkko ei ole käytettävissä</string>
-  <string name="error_http_connection_failed">Yhteys epäonnistui. Odottamaton vastaus yhdistettäessä asetettuun openHAB palvelimeen (HTTP vastaus: %d)</string>
+  <string name="error_http_connection_failed">Yhteys epäonnistui. Odottamaton vastaus yhdistettäessä asetettuun openHAB palvelimeen (HTTP vastaus: %d).</string>
   <string name="error_invalid_url">Kirjoita kelvollinen URL osoite \'http(s)://isäntä(:portti)/\' muodossa</string>
   <string name="error_connection_failed">Yhteys palvelimeen epäonnistui</string>
   <string name="error_unable_to_resolve_hostname">Isäntänimen selvitys epäonnistui</string>
   <string name="error_connection_sslhandshake_failed">SSL kättely epäonnistui</string>
-  <string name="error_certificate_expired">SSL serifikaatti on vanhentunut. Hanki uusi sertifikaatti tai poista käytöstä sertifikaatin vahvistus SSL kättelyn aikana</string>
-  <string name="error_certificate_revoked">SSL serifikaatti on kumottu. Hanki uusi sertifikaatti tai poista käytöstä sertifikaatin vahvistus SSL kättelyn aikana</string>
+  <string name="error_certificate_not_trusted">SSL sertifikaatti ei ole luotettu. Ole hyvä ja tuo root-sertifikaatti tai hyväksy sertifikaatti SSL kättelyn aikana.</string>
+  <string name="error_certificate_expired">SSL serifikaatti on vanhentunut. Hanki uusi sertifikaatti tai hyväksy sertifikaatti SSL kättelyn aikana.</string>
+  <string name="error_certificate_not_valid_yet">SSL sertifikaatti ei ole vielä kelvollinen. Hanki sopiva sertifikaatti tai hyväksy sertifikaatti SSL kättelyn aikana. Tarkista myös, että laitteessasi on oikea kellonaika.</string>
+  <string name="error_certificate_revoked">SSL serifikaatti on kumottu. Hanki uusi sertifikaatti tai hyväksy sertifikaatti SSL kättelyn aikana.</string>
   <string name="error_certificate_wrong_host">Isäntä %s ei hyväksy SSL sertifikaattia</string>
-  <string name="error_http_code_401">Todennus epäonnistui. Tarkista määritetty käyttäjänimi, salasana sekä SSL sertifikaatti(HTTP vastaus 401)</string>
-  <string name="error_http_code_403">Todennus epäonnistui. Tarkista määritetty käyttäjänimi, salasana sekä SSL sertifikaatti (HTTP vastaus 403)</string>
-  <string name="error_http_code_407">Todennus epäonnistui. Tarkista määritetty käyttäjänimi, salasana sekä SSL sertifikaatti (HTTP vastaus 407)</string>
-  <string name="error_http_code_414">Liian pitkä URL osoite. Ole hyvä ja käytä IP osoitetta tai lyhyempää URL osoitetta (HTTP vastaus 414)</string>
-  <string name="error_http_code_426">HTTPS on pakollinen. Ole hyvä ja vaihda URL osoite (HTTP vastaus 426)</string>
+  <string name="error_http_code_401">Todennus epäonnistui. Tarkista määritetty käyttäjänimi ja salasana annetusta SSL sertifikaatista (HTTP vastaus 401).</string>
+  <string name="error_http_code_403">Todennus epäonnistui. Tarkista määritetty käyttäjänimi ja salasana annetusta SSL sertifikaatista (HTTP vastaus 403).</string>
+  <string name="error_http_code_407">Todennus epäonnistui. Tarkista määritetty käyttäjänimi ja salasana annetusta SSL sertifikaatista (HTTP vastaus 407).</string>
+  <string name="error_http_code_414">Liian pitkä URL osoite. Ole hyvä ja käytä IP osoitetta tai lyhyempää URL osoitetta (HTTP vastaus 414).</string>
+  <string name="error_http_code_426">HTTPS on pakollinen. Ole hyvä ja vaihda URL osoite (HTTP vastaus 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Todennus epäonnistui. Ole hyvä ja tarkista annettu SSL sertifikaatti (HTTP vastaus 495)</string>
+  <string name="error_http_code_495">Todennus epäonnistui. Ole hyvä ja tarkista annettu SSL sertifikaatti (HTTP vastaus 495).</string>
   <string name="error_http_code_496">SSL sertifikaatti on pakollinen (HTTP vastaus 496)</string>
   <string name="error_http_code_502">Sinun käänteinen välityspalvelin vastaanotti epäkelvon vastauksen openHAB palvelimelta (HTTP vastaus 502)</string>
   <string name="error_http_code_503">openHAB palvelin on väliaikaisesti pois käytöstä (HTTP vastaus 503)</string>
+  <string name="error_http_code_504">Välityspalvelimen aikakatkaisu. Näyttää siltä että sinun käänteinen välityspalvelin on toiminnassa, mutta ei saanut vastausta openHAB palvelimelta (HTTP vastaus 504).</string>
   <string name="error_http_code_507">openHAB palvelimella ei ole tarpeeksi tilaa (HTTP vastaus 507)</string>
   <string name="error_http_code_511">Verkkoon kirjautuminen vaaditaan (HTTP vastaus 511)</string>
   <string name="error_about_no_conn">Virhe haettaessa openHAB palvelimen tietoja</string>
+  <string name="error_openhab_offline">Sinun openHAB palvelin on offline tilassa, mutta pilvipalvelin toimii</string>
   <string name="title_activity_openhabwritetag">Kirjoita uusi NFC tagi</string>
+  <string name="title_activity_libraries">Käytetyt kirjastot</string>
   <string name="info_write_tag">Kosketa tagia ja pidä se lähellä kunnes varmistusviesti ilmestyy näytölle</string>
   <string name="info_write_tag_progress">Kirjoittaa tagia</string>
   <string name="info_write_tag_finished">Onnistui</string>
@@ -89,12 +104,22 @@
   <string name="nfc_dialog_title">Kirjoita NFC tagin toiminto tälle elementille</string>
   <string name="info_not_set">Ei määritetty</string>
   <!-- Notification list strings -->
+  <string name="notification_list_empty">Ilmoituksia ei toistaiseksi lähetetty</string>
+  <string name="notification_list_error">Virhe ladattaessa ilmoituksia</string>
+  <string name="list_loading_message">Ladataan\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
   <string name="mtm_accept_cert">Hyväksy tuntematon sertifikaatti?</string>
-  <string name="mtm_decision_always">Aina</string>
+  <string name="mtm_trust_anchor">Palvelinsertifikaatti ei ole tunnetun myöntäjän allekirjoittama</string>
+  <string name="mtm_cert_expired">Palvelinsertifikaatti on vanhentunut</string>
+  <string name="mtm_accept_servername">Hyväksy eriävä palvelimen nimi?</string>
+  <string name="mtm_hostname_mismatch">Palvelin ei voinut todentaa: \&quot;%s\&quot;. Sertifikaatti kelpaa vain:</string>
+  <string name="mtm_connect_anyway">Haluatko silti yhdistää?</string>
+  <string name="mtm_cert_details">Ssl sertifikaatin tiedot:</string>
+  <string name="mtm_decision_always">Hyväksy</string>
   <string name="mtm_decision_once">Kerran</string>
   <string name="mtm_decision_abort">Peruuta</string>
   <string name="mtm_notification">Sertifikaatin todennus</string>
+  <string name="settings_openhab_none">Tyhjä</string>
   <!-- Themes -->
   <string name="theme_name_light">Valoisa</string>
   <string name="theme_name_dark">Tumma</string>
@@ -109,6 +134,7 @@
   <string name="nfc_action_toggle">Vaihda</string>
   <string name="nfc_activate">Aktivoi</string>
   <string name="nfc_action_current_color">Nykyinen väri</string>
+  <string name="nfc_action_to_sitemap_page">Mene sivukartalle</string>
   <!-- Drawer -->
   <string name="drawer_open">Sivukartan valitsin avattu</string>
   <string name="drawer_close">Sivukartan valitsin suljettu</string>
@@ -117,6 +143,7 @@
   <string name="about_title">Tietoja</string>
   <string name="about_license_title">Lisenssi</string>
   <string name="about_changelog">Muutosloki</string>
+  <string name="about_source_code">Lähdekoodi</string>
   <string name="about_issues">Ilmoita ongelmasta</string>
   <string name="about_docs">Dokumentointi</string>
   <string name="about_community_forum">Yhteisön foorumi</string>
@@ -124,21 +151,18 @@
   <string name="about_community">openHAB yhteisö</string>
   <string name="about_server">openHAB palvelin</string>
   <string name="about_translation">Auta meitä kääntämään openHAB</string>
-  <string name="settings_debug_messages_summary">Salasanat näkyvät salaamattomana tekstinä!</string>
-  <string name="settings_debug_messages_title">Näytä debug viestit</string>
+  <string name="about_privacy_policy">Tietosuojakäytäntö</string>
+  <string name="settings_debug_messages_title">Näytä tietoja vianmääritykseen</string>
   <string name="error_couldnt_determine_openhab_url">openHAB palvelimen URL osoitetta ei löytynyt</string>
   <string name="unknown">Tuntematon</string>
   <string name="error_network_type_unsupported">Verkon tyyppi (%s) ei tuettu</string>
   <string name="set">Aseta</string>
   <string name="cancel">Peruuta</string>
   <string name="close">Sulje</string>
-  <string name="app_intro">Esittely</string>
-  <string name="intro_welcome">Tervetuloa openHABiin</string>
-  <string name="intro_whatis">Valmistaja- ja teknologiariippumaton avoimen lähdekoodin automaatio-ohjelmisto kotiasi varten</string>
-  <string name="intro_themes">Teemat</string>
-  <string name="intro_themes_description">Valitse useista teemoista</string>
   <string name="try_again_button">Yritä uudelleen</string>
   <string name="go_to_settings_button">Mene asetuksiin</string>
+  <string name="configuration_missing">Sinun openHAB palvelinta ei löydetty automaattisesti. Ole hyvä ja ja aseta sen IP osoite tai isäntänimi palvelinasetuksiin.</string>
+  <string name="no_remote_server">Paikallinen verkko ei ole käytettävissä etkä ole asettanut etäpalvelinta</string>
   <string name="resolving_openhab">Etsitään openHAB palvelinta\u2026</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">Avaa rullaverho</string>
@@ -150,8 +174,17 @@
   <string name="content_description_open_number_picker">Avaa numerovalitsin</string>
   <string name="content_description_video">Video</string>
   <string name="content_description_open_openhab">Avaa openHAB</string>
+  <string name="swipe_to_refresh_description">Sovellus päivittää automaattisesti joten sitä ei tavallisesti tarvitse tehdä itse</string>
   <string name="swipe_to_refresh_dismiss">Selvä!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Esittely</string>
+  <string name="intro_welcome">Tervetuloa openHABiin</string>
+  <string name="intro_whatis">Valmistaja- ja teknologiariippumaton avoimen lähdekoodin automaatio-ohjelmisto kotiasi varten</string>
+  <string name="intro_themes">Teemat</string>
+  <string name="intro_themes_description">Valitse useista teemoista</string>
+  <string name="intro_voice_description">Hallitse kotia äänelläsi</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">Itemin käyttö voidaan sitoa NFC tägeihin painamalla Itemiä pitkään</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">OHITA</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index 9aac17cb325dda12141affad8b311b1ec07e16ea..4428630cd3dd3032e1897ea5cf8c83ee6a6b19c8 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
   <string name="mainmenu_openhab_preferences">Préférences</string>
-  <string name="mainmenu_openhab_selectsitemap">Sélectionner la sitemap par défaut</string>
   <string name="mainmenu_openhab_clearcache">Effacer le cache image</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">Connexion</string>
@@ -22,26 +21,17 @@
   <string name="settings_openhab_username">Identifiant</string>
   <string name="settings_openhab_password">Mot de passe</string>
   <string name="settings_openhab_sslclientcert">Certificat SSL client</string>
-  <string name="settings_openhab_sslclientcert_howto">Certificat SSL client - comment faire</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Taper ici pour avoir de l\'aide sur comment configurer l\'authentification par certificat SSL</string>
   <string name="settings_openhab_screentimeroff">Désactiver l\'extinction d\'écran</string>
   <string name="settings_openhab_screentimeroff_summary">Désactiver l\'extinction d\'écran lorsque l\'app openHAB fonctionne</string>
   <string name="settings_openhab_demomode">Mode démo</string>
   <string name="settings_openhab_demomode_summary">Lancer l\'app openHAB en mode démo</string>
   <string name="settings_openhab_theme">Thème</string>
-  <string name="settings_openhab_sslcert">Ignorer les certificats SSL</string>
-  <string name="settings_openhab_sslcert_summary">Ne vérifie pas le certificat SSL pendant la connexion</string>
-  <string name="settings_openhab_sslhost">Ignorer le domaine SSL</string>
-  <string name="settings_openhab_sslhost_summary">Ne vérifie pas la pertinence du nom de domaine lors de la connexion</string>
   <string name="settings_openhab_fullscreen">Plein écran</string>
   <string name="settings_openhab_fullscreen_summary">Afficher l\'app openHAB en mode plein écran</string>
   <string name="settings_openhab_icon_format">Format des icônes</string>
   <string name="settings_openhab_icon_format_png">Image bitmap</string>
   <string name="settings_openhab_icon_format_svg">Image vectorielle</string>
-  <string name="settings_clear_default_sitemap">Réinitialiser le sitemap par défaut</string>
-  <string name="settings_no_default_sitemap">Pas de sitemap sélectionné</string>
-  <string name="settings_current_default_sitemap">Sitemap par défaut actuel : %1$s</string>
-  <string name="settings_openhab_sslsettings">Chiffrement</string>
   <string name="settings_openhab_alt_connection">Distant</string>
   <string name="settings_openhab_connection">Local</string>
   <!-- App messages strings -->
@@ -51,23 +41,13 @@
   <string name="info_conn_url">Connexion à l\'adresse locale</string>
   <string name="info_conn_rem_url">Connexion à l\'adresse distante</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB a renvoyé une liste vide de sitemaps</string>
   <string name="error_network_not_available">Aucune connexion réseau disponible</string>
-  <string name="error_http_connection_failed">Connexion échouée. Une réponse inattendue a été reçue en essayant de se connecter au serveur openHAB configuré (code de réponse HTTP reçu : %d)</string>
   <string name="error_invalid_url">Entrez une URL valide au format \'http(s)://hote(:port)/\'</string>
   <string name="error_connection_failed">Connexion au domaine échouée</string>
   <string name="error_unable_to_resolve_hostname">Impossible de résoudre le nom d\'hôte</string>
   <string name="error_connection_sslhandshake_failed">Echec de la négotiation SSL</string>
-  <string name="error_certificate_expired">Le certificat SSL a expiré. Veuillez obtenir un nouveau certificat ou désactiver la validation du certificat</string>
-  <string name="error_certificate_revoked">Le certificat SSL a été révoqué. Veuillez obtenir un nouveau certificat ou désactiver la validation du certificat</string>
   <string name="error_certificate_wrong_host">Le certificat SSL n\'est pas valide pour %s</string>
-  <string name="error_http_code_401">L’authentification a échoué. Veuillez vérifier le nom d’utilisateur et mot de passe configurés, respectivement le certificat client SSL fourni (code de réponse HTTP 401)</string>
-  <string name="error_http_code_403">L’authentification a échoué. Veuillez vérifier le nom d’utilisateur et mot de passe configurés, respectivement le certificat client SSL fourni (code de réponse HTTP 403)</string>
-  <string name="error_http_code_407">L’authentification a échoué. Veuillez vérifier le nom d’utilisateur et mot de passe configurés, respectivement le certificat client SSL fourni (code de réponse HTTP 407)</string>
-  <string name="error_http_code_414">URL trop longue. Veuillez utiliser l’adresse IP ou une URL plus courte (code de réponse HTTP 414)</string>
-  <string name="error_http_code_426">HTTPS est requis. Veuillez modifier l’URL (code de réponse HTTP 426)</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">L\'authentification a échoué. Veuillez vérifier l\'identifiant, le mot de passe et le certificat SSL client (code de réponse HTTP 495)</string>
   <string name="error_http_code_496">Certificat SSL client requis (code de réponse HTTP 496)</string>
   <string name="error_http_code_502">Votre proxy inversé a obtenu une réponse non valide du serveur openHAB (code de réponse HTTP 502)</string>
   <string name="error_http_code_503">Le serveur openHAB est temporairement indisponible (code de réponse HTTP 503)</string>
@@ -90,8 +70,6 @@
   <string name="info_not_set">Non paramétré</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Accepter ce certificat inconnu ?</string>
-  <string name="mtm_decision_always">Toujours</string>
   <string name="mtm_decision_once">Une fois</string>
   <string name="mtm_decision_abort">Abandonner</string>
   <string name="mtm_notification">Validation du certificat SSL</string>
@@ -124,19 +102,12 @@
   <string name="about_community">Communauté openHAB</string>
   <string name="about_server">Serveur openHAB</string>
   <string name="about_translation">Aidez-nous à traduire openHAB</string>
-  <string name="settings_debug_messages_summary">Les mots de passe s’affichent en clair !</string>
-  <string name="settings_debug_messages_title">Afficher des messages de debug</string>
   <string name="error_couldnt_determine_openhab_url">Impossible de détermine l\'URL openHAB</string>
   <string name="unknown">Inconnu</string>
   <string name="error_network_type_unsupported">Type de réseau (%s) non supporté</string>
   <string name="set">Définir</string>
   <string name="cancel">Annuler</string>
   <string name="close">Fermer</string>
-  <string name="app_intro">Introduction</string>
-  <string name="intro_welcome">Bienvenue dans openHAB</string>
-  <string name="intro_whatis">Un logiciel open source de domotique pour votre maison non lié à un vendeur ou à une technologie particulière</string>
-  <string name="intro_themes">Thêmes</string>
-  <string name="intro_themes_description">Choisir parmi ces thêmes</string>
   <string name="try_again_button">Réessayer</string>
   <string name="go_to_settings_button">Ouvrir les paramètres</string>
   <string name="resolving_openhab">Tentative de découverte automatique du serveur openHAB\u2026</string>
@@ -152,6 +123,11 @@
   <string name="content_description_open_openhab">Ouvrir openHAB</string>
   <string name="swipe_to_refresh_dismiss">Compris !</string>
   <!-- Intro strings -->
+  <string name="app_intro">Introduction</string>
+  <string name="intro_welcome">Bienvenue dans openHAB</string>
+  <string name="intro_whatis">Un logiciel open source de domotique pour votre maison non lié à un vendeur ou à une technologie particulière</string>
+  <string name="intro_themes">Thêmes</string>
+  <string name="intro_themes_description">Choisir parmi ces thêmes</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">PASSER</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-hu/strings.xml b/mobile/src/main/res/values-hu/strings.xml
index d22e51542a218d0ef31fd4993727157146b86244..d6cc762ff7206c3a063bfa1a7980680e1e626807 100644
--- a/mobile/src/main/res/values-hu/strings.xml
+++ b/mobile/src/main/res/values-hu/strings.xml
@@ -7,7 +7,7 @@
   <string name="app_preferences_name">Beállítások</string>
   <string name="app_notifications">Értesítések</string>
   <!-- Main menu items -->
-  <string name="mainmenu_openhab_sitemaps">Oldaltérképek</string>
+  <string name="mainmenu_openhab_sitemaps">Felületek</string>
   <string name="mainmenu_openhab_preferences">Beállítások</string>
   <string name="mainmenu_openhab_selectsitemap">Válassza ki az alapértelmezett felületet</string>
   <string name="mainmenu_openhab_clearcache">Gyorsítótári képek törlése</string>
@@ -22,17 +22,12 @@
   <string name="settings_openhab_username">Felhasználónév</string>
   <string name="settings_openhab_password">Jelszó</string>
   <string name="settings_openhab_sslclientcert">SSL ügyfél-tanúsítvány</string>
-  <string name="settings_openhab_sslclientcert_howto">SSL ügyféltanúsítvány útmutató</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Koppintson ide, hogy többet tudhasson meg a SSL ügyféltanúsítvány-hitelesítés beállításáról</string>
   <string name="settings_openhab_screentimeroff">Időzített kijelző tiltása</string>
   <string name="settings_openhab_screentimeroff_summary">Ha openHAB fut. Tiltsa le a kijelzővel kapcsolatos időzítőket</string>
   <string name="settings_openhab_demomode">Bemutató mód</string>
   <string name="settings_openhab_demomode_summary">Demo módban fut</string>
   <string name="settings_openhab_theme">Sablonok</string>
-  <string name="settings_openhab_sslcert">SSL-tanúsítvány figyelmen kívül hagyása</string>
-  <string name="settings_openhab_sslcert_summary">Tanúsítvány figyelmen kívül hagyása SSL érvényesít során</string>
-  <string name="settings_openhab_sslhost">SSL - gépnév figyelmen kívül hagyása</string>
-  <string name="settings_openhab_sslhost_summary">SSL - gépnév figyelmen kívül hagyása érvényesít során</string>
   <string name="settings_openhab_fullscreen">Teljes képernyő</string>
   <string name="settings_openhab_fullscreen_summary">Megjelenítése teljes képernyős módban</string>
   <string name="settings_openhab_icon_format">Ikon formátum</string>
@@ -45,10 +40,10 @@
   <string name="settings_chart_scaling_value_m">Alapértelmezett</string>
   <string name="settings_chart_scaling_value_l">Nagy</string>
   <string name="settings_ringtone">Értesítési csengőhang</string>
+  <string name="settings_ringtone_none">Nincs</string>
   <string name="settings_clear_default_sitemap">Alapértelmezett felületet eltávolítása</string>
   <string name="settings_no_default_sitemap">Nincs alapértelmezett felületet kiválasztva</string>
-  <string name="settings_current_default_sitemap">Alapértelmezett felületet</string>
-  <string name="settings_openhab_sslsettings">Titkosítás</string>
+  <string name="settings_current_default_sitemap">Jelenlegi alapértelmezett felületet: %1$s</string>
   <string name="settings_openhab_alt_connection">Távoli</string>
   <string name="settings_openhab_connection">Helyi</string>
   <string name="settings_notification_vibration">Rezgés értesítéskor</string>
@@ -56,6 +51,8 @@
   <string name="settings_notification_vibration_short">Rövid</string>
   <string name="settings_notification_vibration_long">Hosszú</string>
   <string name="settings_notification_vibration_twice">Kétszer</string>
+  <string name="settings_connection_summary">Csatlakoztatva a %s</string>
+  <string name="settings_insecure_connection_summary">Nembiztonságosan csatakoztatva a %s</string>
   <!-- App messages strings -->
   <string name="title_voice_widget">openHAB hangvezérlésére szolgáló parancsok</string>
   <string name="info_voice_input">openHAB, szolgálatodra!</string>
@@ -64,32 +61,33 @@
   <string name="info_conn_url">Kapcsolódás a helyi URL-hez</string>
   <string name="info_conn_rem_url">Kapcsolódás a távoli URL-hez</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB üres oldaltérképet adott vissza</string>
+  <string name="error_empty_sitemap_list">openHAB üres felületet adott vissza</string>
   <string name="error_network_not_available">Hálózat nem elérhető</string>
-  <string name="error_http_connection_failed">Kapcsolódás sikertelen. Egy nem várt válasz érkezett, míg kapcsolódni próbált openHAB szolgálóhoz (HTTP válasz-kód: %d)</string>
+  <string name="error_http_connection_failed">Kapcsolódás sikertelen. Egy nem várt válasz érkezett, míg kapcsolódni próbált az openHAB kiszolgálóhoz (HTTP válasz-kód: %d).</string>
   <string name="error_invalid_url">Adjon meg egy érvényes URL-cím \' http(s)://kiszolgáló(:port)/\' formában</string>
   <string name="error_connection_failed">Sikertelen kapcsolódás</string>
   <string name="error_unable_to_resolve_hostname">Névfeloldás sikertelen</string>
   <string name="error_connection_sslhandshake_failed">SSL ellenőrzés sikertelen</string>
-  <string name="error_certificate_not_trusted">Az SSL-tanúsítvány nem megbízható. Kérjük, importálja a gyökér tanúsítványt, vagy tiltsa le a tanúsítvány ellenőrzést az SSL érvényesítése során</string>
-  <string name="error_certificate_expired">SSL-tanúsítvány már lejárt. Kérjük, szerezzen be új tanúsítványt, vagy tiltsa le a tanúsítvány érvényesítése során az SSL ellenőrzést</string>
-  <string name="error_certificate_not_valid_yet">SSL-tanúsítvány még nem érvényes. Kérjük, szerezzen be egy megfelelő tanúsítványt, vagy tiltsa le a tanúsítvány ellenőrzést az SSL érvényesítése során. Illetve, ellenőrizze készülékén megfelelően van e beállítva az idő</string>
-  <string name="error_certificate_revoked">SSL-tanúsítvány már lejárt. Kérjük, szerezzen be új tanúsítványt, vagy tiltsa le a tanúsítvány érvényesítése során az SSL ellenőrzést</string>
+  <string name="error_certificate_not_trusted">Az SSL-tanúsítvány nem megbízható. Kérjük, importálja a gyökér tanúsítványt, vagy fogadja el a tanúsítványt az SSL handshake közben.</string>
+  <string name="error_certificate_expired">Az SSL tanúsítvány lejárt. Kérjük, szerezzen be új tanúsítványt, vagy fogadja el a tanúsítványt az SSL handshake közben.</string>
+  <string name="error_certificate_not_valid_yet">Az SSL tanúsítvány még nem érvényes. Kérjük, szerezzen be egy megfelelő tanúsítványt, vagy fogadja el a tanúsítványt az SSL handshake közben. Illetve, ellenőrizze készülékén megfelelően van e beállítva az idő.</string>
+  <string name="error_certificate_revoked">Az SSL tanúsítvány vissza lett vonva. Kérjük, szerezzen be új tanúsítványt, vagy fogadja el a tanúsítványt az SSL handshake közben.</string>
   <string name="error_certificate_wrong_host">SSL-tanúsítvány érvénytelen %s</string>
-  <string name="error_http_code_401">A hitelesítés sikertelen. Kérjük, ellenőrizze a beállított felhasználónevet és jelszót, illetve az SSL ügyféltanúsítványt (HTTP-válaszkód 401)</string>
-  <string name="error_http_code_403">A hitelesítés sikertelen. Kérjük, ellenőrizze a beállított felhasználónevet és jelszót, illetve az SSL ügyféltanúsítványt (HTTP-válaszkód 403)</string>
-  <string name="error_http_code_407">A hitelesítés sikertelen. Kérjük, ellenőrizze a beállított felhasználónevet és jelszót, illetve az SSL ügyféltanúsítványt (HTTP-válaszkód 407)</string>
-  <string name="error_http_code_414">URL túl hosszú. Kérjük, használja az IP-címet vagy egy rövidebb URL-t (HTTP-válaszkód 414)</string>
-  <string name="error_http_code_426">Kötelező a HTTPS használata. Módosítsa az URL-t (HTTP válaszkód, 426.)</string>
+  <string name="error_http_code_401">A hitelesítés sikertelen. Kérjük, ellenőrizze a beállított felhasználónevet és jelszót, illetve az SSL ügyféltanúsítványt (HTTP-válaszkód 401).</string>
+  <string name="error_http_code_403">A hitelesítés sikertelen. Kérjük, ellenőrizze a beállított felhasználónevet és jelszót, illetve az SSL ügyféltanúsítványt (HTTP-válaszkód 403).</string>
+  <string name="error_http_code_407">A hitelesítés sikertelen. Kérjük, ellenőrizze a beállított felhasználónevet és jelszót, illetve az SSL ügyféltanúsítványt (HTTP-válaszkód 407).</string>
+  <string name="error_http_code_414">URL túl hosszú. Kérjük, használja az IP-címet vagy egy rövidebb URL-t (HTTP-válaszkód 414).</string>
+  <string name="error_http_code_426">Kötelező a HTTPS használata. Módosítsa az URL-t (HTTP válaszkód, 426.).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">A hitelesítés sikertelen. Kérjük, ellenőrizze a megadott SSL ügyféltanúsítvány (HTTP-válaszkód 495)</string>
+  <string name="error_http_code_495">A hitelesítés sikertelen. Kérjük, ellenőrizze a megadott SSL ügyféltanúsítvány (HTTP-válaszkód 495).</string>
   <string name="error_http_code_496">SSL ügyfél-tanúsítvány szükség (HTTP válasz-kód 496)</string>
   <string name="error_http_code_502">Az átjáró érvénytelen választ kapott a openHAB szervertől (HTTP válaszkód, 502.)</string>
   <string name="error_http_code_503">A openHAB szerver ideiglenesen nem érhető el (HTTP válasz-kód 503)</string>
-  <string name="error_http_code_504">Átjáró időtúllépés. Úgy tűnik, hogy a átjáró fut, de nem kap választ a openHAB szervertől (HTTP-válaszkód 504)</string>
+  <string name="error_http_code_504">Átjáró időtúllépés. Úgy tűnik, hogy a átjáró fut, de nem kap választ a openHAB szervertől (HTTP-válaszkód 504).</string>
   <string name="error_http_code_507">A openHAB kiszolgálón nincs elég szabad hely (HTTP-válaszkód 507)</string>
   <string name="error_http_code_511">Hálózati hitelesítésre van szükség (HTTP válasz-kód 511)</string>
   <string name="error_about_no_conn">Hiba történt az openHAB szerver adatok lekérése közben</string>
+  <string name="error_openhab_offline">A openHAB kiszolgálója offline állapotban van, de a felhő szolgáltatás fut</string>
   <string name="title_activity_openhabwritetag">NFC-címke írása</string>
   <string name="title_activity_libraries">Használt könyvtárak</string>
   <string name="info_write_tag">Érintse meg a címkét, és tartsa közel, amíg meg nem jelenik a visszaigazoló üzenet</string>
@@ -111,7 +109,13 @@
   <string name="list_loading_message">Betöltés\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
   <string name="mtm_accept_cert">Elfogad ismeretlen tanúsítványt?</string>
-  <string name="mtm_decision_always">Mindig</string>
+  <string name="mtm_trust_anchor">A kiszolgáló tanúsítványa nincs aláírva egy ismert hitelesítésszolgáltató által</string>
+  <string name="mtm_cert_expired">A szerver tanúsítvány lejárt</string>
+  <string name="mtm_accept_servername">Elfogad nem egyező kiszolgáló nevet?</string>
+  <string name="mtm_hostname_mismatch">Kiszolgáló nem tudta hitelesíteni a \&quot;%s\&quot;. A tanúsítvány érvényessége:</string>
+  <string name="mtm_connect_anyway">Ennek ellenére szeretne csatlakozni?</string>
+  <string name="mtm_cert_details">Tanúsítvány részletei:</string>
+  <string name="mtm_decision_always">Elfogad</string>
   <string name="mtm_decision_once">Egyszer</string>
   <string name="mtm_decision_abort">Megszakítás</string>
   <string name="mtm_notification">Tanúsítvány ellenőrzése</string>
@@ -130,10 +134,10 @@
   <string name="nfc_action_toggle">Átvált</string>
   <string name="nfc_activate">Aktiválás</string>
   <string name="nfc_action_current_color">Aktuális szín</string>
-  <string name="nfc_action_to_sitemap_page">Ugrás az oldaltérkép oldalra</string>
+  <string name="nfc_action_to_sitemap_page">Ugrás az felületekhez</string>
   <!-- Drawer -->
-  <string name="drawer_open">Oldaltérkép tervező nyitva</string>
-  <string name="drawer_close">Oldaltérkép tervező zárva</string>
+  <string name="drawer_open">Felület tervező nyitva</string>
+  <string name="drawer_close">Felület tervező zárva</string>
   <string name="mainmenu_openhab_voice_recognition">Hangfelsimerés</string>
   <!-- About -->
   <string name="about_title">Névjegy</string>
@@ -148,22 +152,17 @@
   <string name="about_server">openHAB server</string>
   <string name="about_translation">Segíts nekünk az openHAB fordításában</string>
   <string name="about_privacy_policy">Adatvédelmi irányelvek</string>
-  <string name="settings_debug_messages_summary">Jelszavakat egyszerű szövegként jeleníti meg!</string>
-  <string name="settings_debug_messages_title">Hibakeresési üzenetek megjelenítése</string>
+  <string name="settings_debug_messages_title">Mutassa a hibaelhárítási információkat</string>
   <string name="error_couldnt_determine_openhab_url">openHAB URL nem található</string>
   <string name="unknown">Ismeretlen</string>
   <string name="error_network_type_unsupported">Hálózat típusa (%s) nem támogatott</string>
   <string name="set">Beállít</string>
   <string name="cancel">Mégse</string>
   <string name="close">Bezár</string>
-  <string name="app_intro">Intro</string>
-  <string name="intro_welcome">Üdvözöljük openHAB-ban</string>
-  <string name="intro_whatis">Szállító- és technológia független nyílt forráskódú automatizálási szoftver az Ön otthonába</string>
-  <string name="intro_themes">Témák</string>
-  <string name="intro_themes_description">Választhat számos téma közül</string>
   <string name="try_again_button">Próbáld újra</string>
   <string name="go_to_settings_button">Beállítások megnyitása</string>
   <string name="configuration_missing">Az openHAB szervert nem tudta automatikusan felderíteni. Állítsd be manuálisan az IP címet vagy host nevet a szerver beállításokban.</string>
+  <string name="no_remote_server">Helyi hálózat nem érhető el, és a távoli kiszolgáló nincs konfigurálva</string>
   <string name="resolving_openhab">Megpróbálja felderíteni az openHAB szerver példányt\u2026</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">Redőny nyitása</string>
@@ -178,11 +177,16 @@
   <string name="swipe_to_refresh_description">Az alkalmazás frissül automatikusan, általában nem kell saját kezűleg ezt megtenni</string>
   <string name="swipe_to_refresh_dismiss">Értettem!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Intro</string>
+  <string name="intro_welcome">Üdvözöljük openHAB-ban</string>
+  <string name="intro_whatis">Szállító- és technológia független nyílt forráskódú automatizálási szoftver az Ön otthonába</string>
+  <string name="intro_themes">Témák</string>
+  <string name="intro_themes_description">Választhat számos téma közül</string>
+  <string name="intro_voice_description">Irányítsd az otthonod a hangoddal</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">Az elemek vezérlése az elem hosszú megnyomásával összeköthető egy NFC címkékhez</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">Kihagyás</string>
   <!-- Intro "DONE" button -->
   <string name="app_intro_done_button">Kész</string>
-  <string name="intro_voice_description">Irányítsd az otthonod a hangoddal</string>
-  <string name="intro_nfc">NFC</string>
-  <string name="intro_nfc_description">Az elemek vezérlése az elem hosszú megnyomásával köthető az NFC címkékhez</string>
 </resources>
diff --git a/mobile/src/main/res/values-in/strings.xml b/mobile/src/main/res/values-in/strings.xml
index b444e005bed45a06fa918d0fdb46ec31b30760cf..43d7b64aa508bcd50f396dccd14b46c14edc5755 100644
--- a/mobile/src/main/res/values-in/strings.xml
+++ b/mobile/src/main/res/values-in/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Peta Situs</string>
   <string name="mainmenu_openhab_preferences">Pengaturan</string>
-  <string name="mainmenu_openhab_selectsitemap">Pilih peta situs default</string>
   <string name="mainmenu_openhab_clearcache">Hapus cache gambar</string>
   <!-- App settings strings -->
   <string name="settings_openhab_url">URL server lokal</string>
@@ -19,25 +18,17 @@
   <string name="settings_openhab_username">Nama pengguna</string>
   <string name="settings_openhab_password">Kata sandi</string>
   <string name="settings_openhab_sslclientcert">SSL klien sertifikat</string>
-  <string name="settings_openhab_sslclientcert_howto">Sertifikat klien SSL bagaimana caranya</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Ketuk di sini untuk mendapatkan beberapa petunjuk dan penjelasan tentang cara menyiapkan otentikasi sertifikat klien SSL</string>
   <string name="settings_openhab_screentimeroff">Nonaktifkan pewaktu tampilan</string>
   <string name="settings_openhab_screentimeroff_summary">Nonaktifkan tampilan matikan timer saat openHab sedang berlari</string>
   <string name="settings_openhab_demomode">Mode demo</string>
   <string name="settings_openhab_demomode_summary">Jalankan dalam mode demo</string>
   <string name="settings_openhab_theme">Tema</string>
-  <string name="settings_openhab_sslcert">Abaikan sertifikat SSL</string>
-  <string name="settings_openhab_sslcert_summary">Abaikan validasi sertifikat selama SSL jabat tangan</string>
-  <string name="settings_openhab_sslhost">Abaikan nama host SSL</string>
-  <string name="settings_openhab_sslhost_summary">Abaikan nama tempat cek saat SSL jabat tangan</string>
   <string name="settings_openhab_fullscreen">Layar penuh</string>
   <string name="settings_openhab_fullscreen_summary">Tampilan dalam mode layar penuh</string>
   <string name="settings_openhab_icon_format">Format ikon</string>
   <string name="settings_openhab_icon_format_png">Bitmap</string>
   <string name="settings_openhab_icon_format_svg">Vektor</string>
-  <string name="settings_clear_default_sitemap">Hapus peta situs default</string>
-  <string name="settings_no_default_sitemap">Tidak ada peta situs default yang dipilih</string>
-  <string name="settings_current_default_sitemap">Peta Situs default saat ini: %1$s</string>
   <!-- App messages strings -->
   <string name="info_voice_input">openHAB, atas perintahmu!</string>
   <string name="info_voice_recognized_text">Perintah yang Diakui: %1$s</string>
@@ -45,12 +36,9 @@
   <string name="info_conn_url">Menghubungkan ke URL lokal</string>
   <string name="info_conn_rem_url">Menghubungkan ke URL jauh</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB mengembalikan daftar peta situs kosong</string>
   <string name="error_network_not_available">Jaringan tidak tersedia</string>
   <string name="error_connection_failed">Sambungan ke rumah gagal</string>
   <string name="error_unable_to_resolve_hostname">Tidak dapat menyelesaikan nama rumah</string>
-  <string name="error_certificate_expired">Sertifikat SSL tidak dipercaya. Harap impor sertifikat akar atau nonaktifkan sertifikat validasi selama SSL jabat tangan</string>
-  <string name="error_certificate_revoked">Sertifikat SSL telah dicabut. Harap dapatkan sertifikat baru atau nonaktifkan validasi sertifikat selama SSL handshake</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
   <string name="error_http_code_496">Sertifikat relasi SSL diperlukan (kode tanggapan HTTP 496)</string>
   <string name="error_http_code_511">Otentikasi jaringan diperlukan (kode tanggapan HTTP 511)</string>
@@ -69,8 +57,6 @@
   <string name="info_not_set">Tidak diatur</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Terima sertifikat yang tidak diketahui?</string>
-  <string name="mtm_decision_always">Selalu</string>
   <string name="mtm_decision_once">Sekali</string>
   <string name="mtm_decision_abort">Menggugurkan</string>
   <string name="mtm_notification">Verifikasi sertifikat</string>
@@ -94,20 +80,18 @@
   <!-- About -->
   <string name="about_title">Tentang</string>
   <string name="about_license_title">Izin</string>
-  <string name="settings_debug_messages_summary">Kata sandi akan ditampilkan dalam teks yang jelas!</string>
-  <string name="settings_debug_messages_title">Tampilkan pesan debug</string>
   <string name="error_couldnt_determine_openhab_url">Tidak dapat menentukan URL openHAB</string>
   <string name="unknown">Tidak diketahui</string>
   <string name="error_network_type_unsupported">Tipe jaringan (%s) tidak didukung</string>
   <string name="set">Atur</string>
   <string name="cancel">Batalkan</string>
+  <!-- Content description for images -->
+  <!-- Intro strings -->
   <string name="app_intro">Intro</string>
   <string name="intro_welcome">Selamat Datang di openHAB</string>
   <string name="intro_whatis">Sebuah vendor dan teknologi agnostik perangkat lunak open source otomasi untuk rumah Anda</string>
   <string name="intro_themes">Thema</string>
   <string name="intro_themes_description">Pilih di antara beberapa tema</string>
-  <!-- Content description for images -->
-  <!-- Intro strings -->
   <!-- Intro "SKIP" button -->
   <!-- Intro "DONE" button -->
 </resources>
diff --git a/mobile/src/main/res/values-it/strings.xml b/mobile/src/main/res/values-it/strings.xml
index 3a79b2b44c5b038c7146574adb5f24b6432b3f2a..b6488fd90a3b553e7ae8c387148aeb142d825302 100644
--- a/mobile/src/main/res/values-it/strings.xml
+++ b/mobile/src/main/res/values-it/strings.xml
@@ -4,19 +4,189 @@
   <!-- Attention translators! Do NOT submit localized strings through GitHub Pull Request. -->
   <!-- See: https://github.com/openhab/openhab-android/blob/master/README.md#localization -->
   <!-- General app strings -->
+  <string name="app_preferences_name">Impostazioni</string>
+  <string name="app_notifications">Notifiche</string>
   <!-- Main menu items -->
+  <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
+  <string name="mainmenu_openhab_preferences">Impostazioni</string>
+  <string name="mainmenu_openhab_selectsitemap">Seleziona Sitemap predefinito</string>
+  <string name="mainmenu_openhab_clearcache">Pulisci cache immagini</string>
   <!-- App settings strings -->
+  <string name="settings_connection_title">Connessione</string>
+  <string name="settings_display_title">Display</string>
+  <string name="settings_misc_title">Altro</string>
+  <string name="settings_openhab_url">URL del server locale</string>
+  <string name="settings_openhab_url_summary">L\'URL dell\'interfaccia openHAB (basato su IP o hostname). Se configurato, rilevamento automatico è disattivato. Impostazione corrente: %s</string>
+  <string name="settings_openhab_alturl">URL del server remoto</string>
+  <string name="settings_openhab_alturl_summary">L\'URL dell\'interfaccia openHAB utilizzato quando l\'indirizzo locale non è disponibile. Impostazione corrente: %s</string>
+  <string name="settings_openhab_username">Utente</string>
+  <string name="settings_openhab_password">Password</string>
+  <string name="settings_openhab_sslclientcert">Certificato SSL client</string>
+  <string name="settings_openhab_sslclientcert_howto_summary">Tocca qui per suggerimenti e spiegazioni su come configurare l\'autenticazione con certificato SSL client</string>
+  <string name="settings_openhab_screentimeroff">Disattivare la visualizzazione del timer</string>
+  <string name="settings_openhab_screentimeroff_summary">Non mostrare timer di spegnimento quando openHAB e\' in esecuzione</string>
+  <string name="settings_openhab_demomode">Modalità demo</string>
+  <string name="settings_openhab_demomode_summary">Esecuzione in modalità demo</string>
+  <string name="settings_openhab_theme">Tema</string>
+  <string name="settings_openhab_fullscreen">Schermo intero</string>
+  <string name="settings_openhab_fullscreen_summary">Visualizza a schermo intero</string>
+  <string name="settings_openhab_icon_format">Formato icona</string>
+  <string name="settings_openhab_icon_format_png">Bitmap</string>
+  <string name="settings_openhab_icon_format_svg">Vettoriale</string>
+  <string name="settings_chart_scaling">Scala del grafico</string>
+  <string name="settings_chart_scaling_summary">Nota: Con una scala piccola, c\'e\' piu\' spazio per il grafico, ma la leggibilita\' dei caratteri e linee puo\' essere compromessa.</string>
+  <string name="settings_chart_scaling_value_xs">Molto piccolo</string>
+  <string name="settings_chart_scaling_value_s">Piccolo</string>
+  <string name="settings_chart_scaling_value_m">Predefinito</string>
+  <string name="settings_chart_scaling_value_l">Grande</string>
+  <string name="settings_ringtone">Suono per Notifica</string>
+  <string name="settings_ringtone_none">Nessuno</string>
+  <string name="settings_clear_default_sitemap">Cancella Sitemap predefinito</string>
+  <string name="settings_no_default_sitemap">Nessun Sitemap predefinito selezionato</string>
+  <string name="settings_current_default_sitemap">Sitemap predefinito attuale: %1$s</string>
+  <string name="settings_openhab_alt_connection">Remoto</string>
+  <string name="settings_openhab_connection">Locale</string>
+  <string name="settings_notification_vibration">VIbrazione per notifiche</string>
+  <string name="settings_notification_vibration_off">Off</string>
+  <string name="settings_notification_vibration_short">Breve</string>
+  <string name="settings_notification_vibration_long">Lungo</string>
+  <string name="settings_notification_vibration_twice">Due volte</string>
+  <string name="settings_connection_summary">Connesso a %s</string>
+  <string name="settings_insecure_connection_summary">Connesso in modo non sicuro a %s</string>
   <!-- App messages strings -->
+  <string name="title_voice_widget">comandi vocali openHAB</string>
+  <string name="info_voice_input">openHAB, ai tuoi comandi!</string>
+  <string name="info_voice_recognized_text">Comando riconosciuto: %1$s</string>
+  <string name="info_demo_mode_short">Esecuzione in modalità demo</string>
+  <string name="info_conn_url">Connessione a URL locale</string>
+  <string name="info_conn_rem_url">Connessione a URL remoto</string>
   <!-- Error messages -->
+  <string name="error_empty_sitemap_list">openHAB ha ritornato nessun Sitemap</string>
+  <string name="error_network_not_available">Rete non disponibile</string>
+  <string name="error_http_connection_failed">Connessione non riuscita. È stata ricevuta una risposta imprevista durante il tentativo di connessione al server openHAB configurato (codice di risposta HTTP ricevuto: %d).</string>
+  <string name="error_invalid_url">Inserisci un URL valido nella forma \'http(s)://host(:port)/\'</string>
+  <string name="error_connection_failed">Connessione al dispositivo non riuscita</string>
+  <string name="error_unable_to_resolve_hostname">Impossibile risolvere il nome host</string>
+  <string name="error_connection_sslhandshake_failed">Handshake SSL non riuscito</string>
+  <string name="error_certificate_not_trusted">Il certificato SSL non e\' attendibile. Importa un certidicato root o accetta il certificato durante l\'handshake SSL.</string>
+  <string name="error_certificate_expired">Il certificato SSL e\' scaduto. Importa un nuovo certificato o accetta il certificato durante l\'handshake SSL.</string>
+  <string name="error_certificate_not_valid_yet">Certificato SSL non ancora valido. Importa un certificato corretto o accetta Il certificato durante l\'handshake SSL. Verifica se l\'orologio del dispositivo e\' impostato correttamente.</string>
+  <string name="error_certificate_revoked">Il certificato SSL e\' stato revocato. Importa un nuovo certificato o accetta il certificato durante l\'handshake SSL.</string>
+  <string name="error_certificate_wrong_host">Il certificato SSL non e\' valido per %s</string>
+  <string name="error_http_code_401">Autenticazione non riuscita. Controlla l\'utente e password configurati nel certificato SSL (codice risposta HTTP 401).</string>
+  <string name="error_http_code_403">Autenticazione non riuscita. Controlla l\'utente e password configurati nel certificato SSL (codice risposta HTTP 403).</string>
+  <string name="error_http_code_407">Autenticazione non riuscita. Controlla l\'utente e password configurati nel certificato SSL (codice risposta HTTP 407).</string>
+  <string name="error_http_code_414">URL è troppo lungo. Utilizzare l\'indirizzo IP o un URL più corto (codice di risposta HTTP 414).</string>
+  <string name="error_http_code_426">HTTPS è obbligatorio. Si prega di cambiare l\'URL (codice di risposta HTTP 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
+  <string name="error_http_code_495">Autenticazione non riuscita. Verificare il certificato client SSL fornito (codice di risposta HTTP 495).</string>
+  <string name="error_http_code_496">E\' richiesto un certificato SSL (codice risposta HTTP 496)</string>
+  <string name="error_http_code_502">Il reverse proxy ha ricevuto una risposta non valida dal server openHAB (codice risposta HTTP 502)</string>
+  <string name="error_http_code_503">Il server openHAB non e\' temporaneamente disponibile (codice risposta HTTP 503)</string>
+  <string name="error_http_code_504">Gateway timeout. Sembra che il tuo reverse proxy e\' in esecuzione, ma non riceve una risposta dal server openHAB (codice risposta HTTP 504).</string>
+  <string name="error_http_code_507">Il server openHAB non ha abbastanza spazio disponibile (codice risposta HTTP 507)</string>
+  <string name="error_http_code_511">E\' richiesta un\'autenticazione di rete (codice risposta HTTP 511)</string>
+  <string name="error_about_no_conn">Errore nel recupero delle informazioni dal server openHAB</string>
+  <string name="error_openhab_offline">Il server di openHAB è offline mentre è in esecuzione l\'istanza cloud</string>
+  <string name="title_activity_openhabwritetag">Scrittura tag NFC</string>
+  <string name="title_activity_libraries">Librerie usate</string>
+  <string name="info_write_tag">Tocca il tag e tienilo premuto fino alla comparsa del messaggio di conferma</string>
+  <string name="info_write_tag_progress">Salvando sul tag</string>
+  <string name="info_write_tag_finished">Completato correttamente</string>
+  <string name="info_write_failed">Errore in scrittura sul tag</string>
+  <string name="info_write_tag_unsupported">Il dispositivo non ha il supporto NFC</string>
+  <string name="info_write_tag_disabled">NFC e\' disabilitato. Attivarlo nel menu impostazioni del dispositivo.</string>
+  <string name="info_openhab_apiversion_label">versione delle Rest API di openHAB</string>
+  <string name="info_openhab_uuid_label">openHAB UUID</string>
+  <string name="info_openhab_secret_label">openHAB Secret</string>
+  <string name="info_openhab_push_notification_label">Stato delle notifiche push</string>
+  <string name="action_settings">Impostazioni</string>
+  <string name="nfc_dialog_title">Salvare le azioni sul tag NFC per questo elemento</string>
+  <string name="info_not_set">Non impostato</string>
   <!-- Notification list strings -->
+  <string name="notification_list_empty">Finora nessuna notifica spedita</string>
+  <string name="notification_list_error">E\' successo un error durante il caricamento delle notifiche</string>
+  <string name="list_loading_message">Caricamento\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
+  <string name="mtm_accept_cert">Accetti il certificato sconosciuto?</string>
+  <string name="mtm_trust_anchor">Il certificato del server non è firmato da un\'autorità di certificazione conosciuta</string>
+  <string name="mtm_cert_expired">Il certificato del server è scaduto</string>
+  <string name="mtm_accept_servername">Accettare Nome Server diverso?</string>
+  <string name="mtm_hostname_mismatch">Server non può autenticare come \&quot;%s\&quot;. Il certificato è solo valido per:</string>
+  <string name="mtm_connect_anyway">Vuoi collegarti comunque?</string>
+  <string name="mtm_cert_details">Dettagli certificato:</string>
+  <string name="mtm_decision_always">Accetta</string>
+  <string name="mtm_decision_once">Una volta</string>
+  <string name="mtm_decision_abort">Annulla</string>
+  <string name="mtm_notification">Verifica del certificato</string>
+  <string name="settings_openhab_none">Nessuno</string>
   <!-- Themes -->
+  <string name="theme_name_light">Chiaro</string>
+  <string name="theme_name_dark">Scuro</string>
+  <string name="theme_name_black">Nero/AMOLED</string>
+  <string name="theme_name_basic_ui">Basic UI</string>
+  <string name="theme_name_basic_ui_dark">Basic UI scuro</string>
   <!-- NFC -->
+  <string name="nfc_action_on">On</string>
+  <string name="nfc_action_up">Su</string>
+  <string name="nfc_action_off">Off</string>
+  <string name="nfc_action_down">Giù</string>
+  <string name="nfc_action_toggle">Alterna</string>
+  <string name="nfc_activate">Attiva</string>
+  <string name="nfc_action_current_color">Colore attuale</string>
+  <string name="nfc_action_to_sitemap_page">Naviga alla pagina dei Sitemap</string>
   <!-- Drawer -->
+  <string name="drawer_open">Sitemap drawer aperto</string>
+  <string name="drawer_close">Sitemap drawer chiuso</string>
+  <string name="mainmenu_openhab_voice_recognition">Riconoscimento vocale</string>
   <!-- About -->
+  <string name="about_title">Info</string>
+  <string name="about_license_title">Licenza</string>
+  <string name="about_changelog">Aggiornamenti</string>
+  <string name="about_source_code">Codice sorgente</string>
+  <string name="about_issues">Riporta un problema</string>
+  <string name="about_docs">Documentazione</string>
+  <string name="about_community_forum">Forum della Comunità</string>
+  <string name="about_foundation">openHAB Foundation</string>
+  <string name="about_community">comunità openHAB</string>
+  <string name="about_server">server openHAB</string>
+  <string name="about_translation">Aiutaci a tradurre openHAB</string>
+  <string name="about_privacy_policy">Informativa sulla privacy</string>
+  <string name="settings_debug_messages_title">Mostra informazioni per la risoluzione dei problemi</string>
+  <string name="error_couldnt_determine_openhab_url">Non trovo openHAB URL</string>
+  <string name="unknown">Sconosciuto</string>
+  <string name="error_network_type_unsupported">Tipo di rete (%s) non supportata</string>
+  <string name="set">Set</string>
+  <string name="cancel">Annulla</string>
+  <string name="close">Chiudi</string>
+  <string name="try_again_button">Riprova</string>
+  <string name="go_to_settings_button">Vai alle impostazioni</string>
+  <string name="configuration_missing">Il tuo server openHAB non puo\' essere individuato automaticamente. Per favore configura il suo indirizzo IP o il nome host nelle impostazioni server.</string>
+  <string name="no_remote_server">Rete locale non è disponibile e non è stato configurato un server remotol</string>
+  <string name="resolving_openhab">Individuando l\'istanza openHAB\u2026</string>
   <!-- Content description for images -->
+  <string name="content_description_open_roller_shutter">Apertura tapparella</string>
+  <string name="content_description_stop_roller_shutter">Ferma tapparella</string>
+  <string name="content_description_close_roller_shutter">Chiusura tapparella</string>
+  <string name="content_description_open_color_wheel">Apri ruota dei colori</string>
+  <string name="content_description_color_up">On o ferma l\'aumento luminosita\'</string>
+  <string name="content_description_color_down">Off o ferma l\'aumento luminosita\'</string>
+  <string name="content_description_open_number_picker">Apri selezione numero</string>
+  <string name="content_description_video">Video</string>
+  <string name="content_description_open_openhab">Apri openHAB</string>
+  <string name="swipe_to_refresh_description">L\'applicazione si aggiorna automaticamente, normalmente non serve farlo manualmente</string>
+  <string name="swipe_to_refresh_dismiss">Ricevuto!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Intro</string>
+  <string name="intro_welcome">Benvenuto in openHAB</string>
+  <string name="intro_whatis">Una soluzione domotica open source, indipendente dalla tecnologia e dai produttori per la tua casa</string>
+  <string name="intro_themes">Temi</string>
+  <string name="intro_themes_description">Scegli tra i diversi temi</string>
+  <string name="intro_voice_description">Controlla la tua casa con la tua voce</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">Il controllo dell\'item puo\' essere associato a un tag NFC premendo a lungo sull\'item</string>
   <!-- Intro "SKIP" button -->
+  <string name="app_intro_skip_button">SALTA</string>
   <!-- Intro "DONE" button -->
+  <string name="app_intro_done_button">FATTO</string>
 </resources>
diff --git a/mobile/src/main/res/values-iw/strings.xml b/mobile/src/main/res/values-iw/strings.xml
index d57fe645b3203cc3953e71b06e63de7d3f4a7ff9..d1a63601f5d8482e4f20ddeb5d7b77818a8722b4 100644
--- a/mobile/src/main/res/values-iw/strings.xml
+++ b/mobile/src/main/res/values-iw/strings.xml
@@ -22,17 +22,12 @@
   <string name="settings_openhab_username">שם משתמש</string>
   <string name="settings_openhab_password">סיסמה</string>
   <string name="settings_openhab_sslclientcert">תעודת לקוח SSL</string>
-  <string name="settings_openhab_sslclientcert_howto">תעודת לקוח SSL \' כיצד להגדיר \'</string>
   <string name="settings_openhab_sslclientcert_howto_summary">הקש כאן כדי לקבל כמה רמזים והסברים על איך להגדיר אימות תעודת לקוח SSL</string>
   <string name="settings_openhab_screentimeroff">ביטול כיבוי מסך אוטומטי</string>
   <string name="settings_openhab_screentimeroff_summary">בטל את קוצב הזמן לכיבוי המסך כאשר אפליקצית openHAB פועלת</string>
   <string name="settings_openhab_demomode">מצב הדגמה</string>
   <string name="settings_openhab_demomode_summary">הפעל במצב הדגמה</string>
   <string name="settings_openhab_theme">ערכת עיצוב</string>
-  <string name="settings_openhab_sslcert">התעלם מתעודת SSL</string>
-  <string name="settings_openhab_sslcert_summary">התעלם מאימות תעודה בעת חיבור SSL</string>
-  <string name="settings_openhab_sslhost">התעלם משם שרת SSL</string>
-  <string name="settings_openhab_sslhost_summary">התעלם מבדיקת שם השרת בעת חיבור SSL</string>
   <string name="settings_openhab_fullscreen">מסך מלא</string>
   <string name="settings_openhab_fullscreen_summary">הצג במסך מלא</string>
   <string name="settings_openhab_icon_format">סוג קובץ צלמית</string>
@@ -45,10 +40,10 @@
   <string name="settings_chart_scaling_value_m">ברירת מחדל</string>
   <string name="settings_chart_scaling_value_l">גדול</string>
   <string name="settings_ringtone">צליל התראה</string>
+  <string name="settings_ringtone_none">ללא</string>
   <string name="settings_clear_default_sitemap">נקה את הגדרת ברירת מחדל של תצורת המערכת</string>
   <string name="settings_no_default_sitemap">לא נבחרה תצורת מערכת ברירת מחדל</string>
   <string name="settings_current_default_sitemap">ברירת המחדל הנוכחית של תצורת המערכת: %1$s</string>
-  <string name="settings_openhab_sslsettings">הצפנה</string>
   <string name="settings_openhab_alt_connection">מרוחק</string>
   <string name="settings_openhab_connection">מקומי</string>
   <string name="settings_notification_vibration">רטט התראה</string>
@@ -56,6 +51,8 @@
   <string name="settings_notification_vibration_short">קצר</string>
   <string name="settings_notification_vibration_long">ארוך</string>
   <string name="settings_notification_vibration_twice">כפול</string>
+  <string name="settings_connection_summary">מחובר ל- %s</string>
+  <string name="settings_insecure_connection_summary">חיבור לא מאובטח ל- %s</string>
   <!-- App messages strings -->
   <string name="title_voice_widget">פקודות קוליות של openHAB</string>
   <string name="info_voice_input">openHAB, לפקודתך!</string>
@@ -66,30 +63,31 @@
   <!-- Error messages -->
   <string name="error_empty_sitemap_list">openHAB החזיר רשימה ריקה של תצורות מערכת</string>
   <string name="error_network_not_available">הרשת לא זמינה</string>
-  <string name="error_http_connection_failed">החיבור נכשל. תקלה בלתי צפויה בעת חיבור לשרת openHAB המוגדר (שגיאת HTTP מספר: %d)</string>
+  <string name="error_http_connection_failed">ההתחברות נכשלה. תגובה בלתי צפויה התקבלה בעת ניסיון להתחבר אל שרת openHAB המוגדר (קוד תגובה HTTP שהתקבל: %d).</string>
   <string name="error_invalid_url">אנא הזן כתובת שרת חוקית בתבנית \'/http(s)://host(:port)\'</string>
   <string name="error_connection_failed">החיבור למחשב המארח נכשל</string>
   <string name="error_unable_to_resolve_hostname">אין אפשרות לאתר את שם המחשב המארח</string>
   <string name="error_connection_sslhandshake_failed">חיבור SSL נכשל</string>
-  <string name="error_certificate_not_trusted">אישור SSL אינו מהימן. אנא ייבא אישור בסיסי או בטל אימות אישור במהלך חיבור SSL</string>
-  <string name="error_certificate_expired">אישור SSL פג תוקף. אנא ייבא אישורי בסיס או בטל אימות אישור במהלך חיבור SSL</string>
-  <string name="error_certificate_not_valid_yet">אישור SSL עדיין אינו חוקי. נא קבל אישור מתאים או בטל אימות אישור בתהליך בדיקת SSL. כמו כן יש לבדוק אם השעון במכשיר מוגדר כראוי</string>
-  <string name="error_certificate_revoked">אישור SSL נשלל. אנא ייבא אישור חדש או בטל אימות אישור במהלך חיבור SSL</string>
+  <string name="error_certificate_not_trusted">תעודת SSL אינה אמינה. בבקשה ייבא את התעודה הראשית או קבל את התעודה במהלך חיבור SSL.</string>
+  <string name="error_certificate_expired">פג תוקפה של תעודת SSL. נא לייבא תעודה חדשה או קבל את התעודה במהלך חיבור SSL.</string>
+  <string name="error_certificate_not_valid_yet">תעודת SSL עוד לא בתוקף. יש צורך בקבלת תעודה בתוקף או לקבל את אימות התעודה בזמן תהליך SSL. כמו כן יש לבדוק אם השעון במכשיר מכוון כראוי.</string>
+  <string name="error_certificate_revoked">תעודת SSL נשללה. נא לייבא תעודה חדשה או קבל את התעודה במהלך חיבור SSL.</string>
   <string name="error_certificate_wrong_host">תעודת SSL אינה חוקית עבור %s</string>
-  <string name="error_http_code_401">האימות נכשל. נא בדוק את שם המשתמש והסיסמה שהוגדרו בהתאמה עם תעודת ה-SSL (קוד תגובה HTTP 401)</string>
-  <string name="error_http_code_403">האימות נכשל. נא בדוק את שם המשתמש והסיסמה שהוגדרו בהתאמה עם תעודת ה-SSL (קוד תגובה HTTP 403)</string>
-  <string name="error_http_code_407">האימות נכשל. נא בדוק את שם המשתמש והסיסמה שהוגדרו בהתאמה עם תעודת ה-SSL (קוד תגובה HTTP 407)</string>
-  <string name="error_http_code_414">שורת הכתובת ארוכה מדי. נא השתמש בכתובת IP או בכתובת קצרה יותר (קוד תגובה HTTP 414)</string>
-  <string name="error_http_code_426">HTTPS נדרש. יש לשנות את הכתובת (קוד תגובה HTTP 426)</string>
+  <string name="error_http_code_401">האימות נכשל. נא בדוק את שם המשתמש והסיסמה שהוגדרו בהתאמה עם תעודת ה-SSL (קוד תגובה HTTP 401).</string>
+  <string name="error_http_code_403">האימות נכשל. נא בדוק את שם המשתמש והסיסמה שהוגדרו בהתאמה עם תעודת ה-SSL (קוד תגובה HTTP 403).</string>
+  <string name="error_http_code_407">האימות נכשל. נא בדוק את שם המשתמש והסיסמה שהוגדרו בהתאמה עם תעודת ה-SSL (קוד תגובה HTTP 407).</string>
+  <string name="error_http_code_414">שורת הכתובת ארוכה מדי. נא השתמש בכתובת IP או בכתובת קצרה יותר (קוד תגובה HTTP 414).</string>
+  <string name="error_http_code_426">HTTPS נדרש. יש לשנות את הכתובת (קוד תגובה HTTP 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">האימות נכשל. בדוק את תעודת אישור לקוח SSL (קוד תגובה HTTP 495)</string>
+  <string name="error_http_code_495">האימות נכשל. בדוק את תעודת SSL (קוד תגובה HTTP 495).</string>
   <string name="error_http_code_496">נדרשת תעודת לקוח SSL (קוד תגובה HTTP 496)</string>
   <string name="error_http_code_502">שרת ה-reverse proxy קיבל תשובה שגויה משרת ה-openHAB (קוד תגובה HTTP 502)</string>
   <string name="error_http_code_503">שרת openHAB אינו זמין באופן זמני (קוד תגובה HTTP 503)</string>
-  <string name="error_http_code_504">Gateway Time-out. נראה כי שרת ה-reverse proxy פעיל, אך לא נתקבלה תשובה משרת openHAB (קוד תגובה HTTP 504)</string>
+  <string name="error_http_code_504">Gateway Time-out. נראה כי שרת ה-reverse proxy פעיל, אך לא נתקבלה תשובה משרת openHAB (קוד תגובה HTTP 504).</string>
   <string name="error_http_code_507">אין מספיק שטח פנוי לשרת openHAB (קוד תגובה HTTP 507)</string>
   <string name="error_http_code_511">נדרש אימות רשת (קוד תגובה HTTP 511)</string>
   <string name="error_about_no_conn">אירעה שגיאה בעת בקשת מידע משרת openHAB</string>
+  <string name="error_openhab_offline">שרת openHAB שלך אינו מקוון בזמן שהשרת בענן פעיל</string>
   <string name="title_activity_openhabwritetag">כתיבה לתגית NFC</string>
   <string name="title_activity_libraries">ספריות בשימוש</string>
   <string name="info_write_tag">הצמד תגית והשאר אותה קרובה עד להופעת הודעת אישור</string>
@@ -111,7 +109,13 @@
   <string name="list_loading_message">טוען...</string>
   <!-- Strings for MemorizingTrustManager activity -->
   <string name="mtm_accept_cert">לקבל אישור/תעודה לא מזוהה?</string>
-  <string name="mtm_decision_always">תמיד</string>
+  <string name="mtm_trust_anchor">התעודה בשרת אינה חתומה על-ידי רשות אישורים ידועה</string>
+  <string name="mtm_cert_expired">פג תוקפה של תעודה/אישור השרת</string>
+  <string name="mtm_accept_servername">האם לקבל את שם השרת הלא תואם?</string>
+  <string name="mtm_hostname_mismatch">השרת לא יכול להתחבר כ: \&quot;%s\&quot;. התעודה תקפה רק עבור:</string>
+  <string name="mtm_connect_anyway">האם ברצונך להמשיך בהתחברות בכל מקרה?</string>
+  <string name="mtm_cert_details">פרטי התעודה:</string>
+  <string name="mtm_decision_always">קבל\י</string>
   <string name="mtm_decision_once">חד פעמי</string>
   <string name="mtm_decision_abort">בטל</string>
   <string name="mtm_notification">אימות תעודה</string>
@@ -130,7 +134,7 @@
   <string name="nfc_action_toggle">החלף מצב</string>
   <string name="nfc_activate">הפעל</string>
   <string name="nfc_action_current_color">צבע נוכחי</string>
-  <string name="nfc_action_to_sitemap_page">עבור אל דף תצורת המערכת</string>
+  <string name="nfc_action_to_sitemap_page">נווט אל הדף הראשי של תצורת המערכת</string>
   <!-- Drawer -->
   <string name="drawer_open">מגירת תצורת מערכת נפתחה</string>
   <string name="drawer_close">מגירת תצורת מערכת נסגרה</string>
@@ -148,22 +152,17 @@
   <string name="about_server">שרת openHAB</string>
   <string name="about_translation">עזור לנו לתרגם את openHAB</string>
   <string name="about_privacy_policy">מדיניות פרטיות</string>
-  <string name="settings_debug_messages_summary">התווים בסיסמאות יוצגו כטקסט!</string>
-  <string name="settings_debug_messages_title">הצג הודעות לאיתור באגים</string>
+  <string name="settings_debug_messages_title">הצג מידע לפתרון בעיות</string>
   <string name="error_couldnt_determine_openhab_url">לא מצליח לאתר את הכתובת של openHAB</string>
   <string name="unknown">לא ידוע</string>
   <string name="error_network_type_unsupported">אין תמיכה בסוג הרשת (%s)</string>
   <string name="set">קבע</string>
   <string name="cancel">ביטול</string>
   <string name="close">סגור</string>
-  <string name="app_intro">הקדמה</string>
-  <string name="intro_welcome">ברוכים הבאים ל openHAB</string>
-  <string name="intro_whatis">תוכנת קוד פתוח, בלתי תלויה בייצרנים וטכנולוגיות, לאוטומציה שליטה ובקרה לבית שלך</string>
-  <string name="intro_themes">ערכות עיצוב</string>
-  <string name="intro_themes_description">בחר בין מספר ערכות עיצוב</string>
   <string name="try_again_button">נסה שוב</string>
   <string name="go_to_settings_button">עבור להגדרות</string>
   <string name="configuration_missing">השרת של openHAB לא ניתן לגילוי באופן אוטומטי. נא להגדיר את כתובת ה IP של השרת או את שמו בתפריט הגדרות שרת.</string>
+  <string name="no_remote_server">הרשת המקומית אינה זמינה ולא הוגדר שרת מרוחק</string>
   <string name="resolving_openhab">מנסה לאתר שרת openHAB</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">פתח תריס גלילה</string>
@@ -178,11 +177,16 @@
   <string name="swipe_to_refresh_description">היישום מרענן באופן אוטומטי, בדרך כלל אין צורך לבצע זאת ידנית</string>
   <string name="swipe_to_refresh_dismiss">הבנתי!</string>
   <!-- Intro strings -->
+  <string name="app_intro">הקדמה</string>
+  <string name="intro_welcome">ברוכים הבאים ל openHAB</string>
+  <string name="intro_whatis">תוכנת קוד פתוח, בלתי תלויה בייצרנים וטכנולוגיות, לאוטומציה שליטה ובקרה לבית שלך</string>
+  <string name="intro_themes">ערכות עיצוב</string>
+  <string name="intro_themes_description">בחר בין מספר ערכות עיצוב</string>
+  <string name="intro_voice_description">שלוט בביתך בעזרת הקול שלך</string>
+  <string name="intro_nfc">NFC תקשורת לטווח קצר</string>
+  <string name="intro_nfc_description">השליטה בפריט יכולה להיות משוייכת לתגית NFC באמצעות לחיצה ממושכת על הפריט</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">דלג</string>
   <!-- Intro "DONE" button -->
   <string name="app_intro_done_button">סיים</string>
-  <string name="intro_voice_description">שלוט בביתך בעזרת הקול שלך</string>
-  <string name="intro_nfc">NFC תקשורת לטווח קצר</string>
-  <string name="intro_nfc_description">השליטה בפריט יכולה להיות משוייכת לתגית NFC באמצעות לחיצה ממושכת על הפריט</string>
 </resources>
diff --git a/mobile/src/main/res/values-ja/strings.xml b/mobile/src/main/res/values-ja/strings.xml
index d284bd33f24a4860520e500314fe89db7cd18188..f7d1103a82ae7c33e035fc2ca67565f576889253 100644
--- a/mobile/src/main/res/values-ja/strings.xml
+++ b/mobile/src/main/res/values-ja/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">サイトマップ</string>
   <string name="mainmenu_openhab_preferences">設定</string>
-  <string name="mainmenu_openhab_selectsitemap">デフォルトのサイトマップを選択</string>
   <string name="mainmenu_openhab_clearcache">画像キャッシュをクリア</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">接続設定</string>
@@ -22,17 +21,12 @@
   <string name="settings_openhab_username">ユーザー名</string>
   <string name="settings_openhab_password">パスワード</string>
   <string name="settings_openhab_sslclientcert">SSL クライアント証明書</string>
-  <string name="settings_openhab_sslclientcert_howto">SSL クライアント証明書 how-to</string>
   <string name="settings_openhab_sslclientcert_howto_summary">ここをタップすると SSL クライアント証明書認証を設定する方法について、いくつかのヒントや説明を得ることができます</string>
   <string name="settings_openhab_screentimeroff">ディスプレイタイマーを無効にする</string>
   <string name="settings_openhab_screentimeroff_summary">openHAB が実行中のとき、ディスプレイがオフにならないようにします</string>
   <string name="settings_openhab_demomode">デモモード</string>
   <string name="settings_openhab_demomode_summary">デモモードで openHAB を実行します</string>
   <string name="settings_openhab_theme">テーマ</string>
-  <string name="settings_openhab_sslcert">SSL 証明書を無視する</string>
-  <string name="settings_openhab_sslcert_summary">SSL ハンドシェイクの間、証明書の検証を無効にします</string>
-  <string name="settings_openhab_sslhost">SSL ホスト名を無効にする</string>
-  <string name="settings_openhab_sslhost_summary">SSL ハンドシェイクの間、ホスト名のチェックを無視します</string>
   <string name="settings_openhab_fullscreen">フルスクリーン</string>
   <string name="settings_openhab_fullscreen_summary">全画面モードで表示します</string>
   <string name="settings_openhab_icon_format">アイコン形式</string>
@@ -45,10 +39,6 @@
   <string name="settings_chart_scaling_value_m">デフォルト</string>
   <string name="settings_chart_scaling_value_l">大</string>
   <string name="settings_ringtone">通知の着信音</string>
-  <string name="settings_clear_default_sitemap">デフォルトのサイトマップをクリア</string>
-  <string name="settings_no_default_sitemap">デフォルトのサイトマップが選択されていません</string>
-  <string name="settings_current_default_sitemap">現在のデフォルトサイトマップ: %1$s</string>
-  <string name="settings_openhab_sslsettings">暗号化の設定</string>
   <string name="settings_openhab_alt_connection">リモートサーバーの設定</string>
   <string name="settings_openhab_connection">ローカルサーバーの設定</string>
   <!-- App messages strings -->
@@ -59,23 +49,13 @@
   <string name="info_conn_url">設定した URL に接続しています</string>
   <string name="info_conn_rem_url">リモート URL に接続しています</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB は空のサイトマップリストを返しました</string>
   <string name="error_network_not_available">ネットワークが利用できません</string>
-  <string name="error_http_connection_failed">openHAB から無効な応答を受信しました。openHAB が正常に機能しているかどうかを確認してください (HTTP 応答コード %d)</string>
   <string name="error_invalid_url">\'http(s)://host(:port)/\' の形式で、正しい URL を入力してください</string>
   <string name="error_connection_failed">ホストへの接続に失敗しました</string>
   <string name="error_unable_to_resolve_hostname">ホスト名を解決できません</string>
   <string name="error_connection_sslhandshake_failed">SSL ハンドシェイクに失敗しました - 有効なクライアント証明書が必要かもしれません</string>
-  <string name="error_certificate_expired">SSL 証明書が有効期限切れです。新しい証明書を取得するか、SSL ハンドシェイクの際に証明書の検証を無効にしてください。</string>
-  <string name="error_certificate_revoked">SSL 証明書が失効しています。新しい証明書を取得するか、SSL ハンドシェイクの際に証明書の検証を無効にしてください。</string>
   <string name="error_certificate_wrong_host">%s の SSL 証明書が無効です</string>
-  <string name="error_http_code_401">ユーザー認証に失敗しました。ユーザー名、パスワード、SSL クライアント証明書を確認してください (HTTP 応答コード 401)</string>
-  <string name="error_http_code_403">ユーザー認証に失敗しました。ユーザー名、パスワード、SSL クライアント証明書を確認してください (HTTP 応答コード 403)</string>
-  <string name="error_http_code_407">ユーザー認証に失敗しました。ユーザー名、パスワード、SSL クライアント証明書を確認してください (HTTP 応答コード 407)</string>
-  <string name="error_http_code_414">openHAB URL が長すぎます (HTTP 応答コード 414)</string>
-  <string name="error_http_code_426">HTTPS が必要です。openHAB URL を変更してください (HTTP 応答コード 426)</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">SSL クライアント証明書が無効 (HTTP 応答コード 495)</string>
   <string name="error_http_code_496">SSL クライアント証明書が必要 (HTTP 応答コード 496)</string>
   <string name="error_http_code_502">リバースプロキシが openHAB から無効な応答を受け取りました (HTTP 応答コード 502)</string>
   <string name="error_http_code_503">openHAB は一時的に利用できません (HTTP 応答コード 503)</string>
@@ -98,8 +78,6 @@
   <string name="info_not_set">未設定</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">不明な証明書を受け取りますか?</string>
-  <string name="mtm_decision_always">常に</string>
   <string name="mtm_decision_once">一度だけ</string>
   <string name="mtm_decision_abort">中断</string>
   <string name="mtm_notification">証明書の検証</string>
@@ -118,7 +96,6 @@
   <string name="nfc_action_toggle">切り替え</string>
   <string name="nfc_activate">アクティベート</string>
   <string name="nfc_action_current_color">現在の色</string>
-  <string name="nfc_action_to_sitemap_page">サイトマップのページに移動</string>
   <!-- Drawer -->
   <string name="drawer_open">サイトマップドロワーを開きました</string>
   <string name="drawer_close">サイトマップドロワーを閉じました</string>
@@ -136,19 +113,12 @@
   <string name="about_server">openHAB サーバー</string>
   <string name="about_translation">openHAB の翻訳にご協力ください</string>
   <string name="about_privacy_policy">プライバシーポリシー</string>
-  <string name="settings_debug_messages_summary">パスワードが平文で表示されます!</string>
-  <string name="settings_debug_messages_title">デバッグメッセージを表示</string>
   <string name="error_couldnt_determine_openhab_url">OpenHAB URL を特定できませんでした</string>
   <string name="unknown">不明</string>
   <string name="error_network_type_unsupported">ネットワークの形式 (%s) はサポートされていません</string>
   <string name="set">設定</string>
   <string name="cancel">キャンセル</string>
   <string name="close">閉じる</string>
-  <string name="app_intro">はじめに</string>
-  <string name="intro_welcome">openHAB へようこそ</string>
-  <string name="intro_whatis">ホーム用、ベンダーや技術に依存しないオープンソースのオートメーションソフトウェア</string>
-  <string name="intro_themes">テーマ</string>
-  <string name="intro_themes_description">いくつかのテーマから選択してください</string>
   <string name="try_again_button">もう一度やり直す</string>
   <string name="go_to_settings_button">設定に移動</string>
   <string name="resolving_openhab">openHAB サーバーインスタンスの探索中\u2026</string>
@@ -164,6 +134,11 @@
   <string name="content_description_open_openhab">openHAB を開く</string>
   <string name="swipe_to_refresh_dismiss">了解!</string>
   <!-- Intro strings -->
+  <string name="app_intro">はじめに</string>
+  <string name="intro_welcome">openHAB へようこそ</string>
+  <string name="intro_whatis">ホーム用、ベンダーや技術に依存しないオープンソースのオートメーションソフトウェア</string>
+  <string name="intro_themes">テーマ</string>
+  <string name="intro_themes_description">いくつかのテーマから選択してください</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">スキップ</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-lt/strings.xml b/mobile/src/main/res/values-lt/strings.xml
index 0a6569cb32098cf65a2d62674e618e5d6a579907..b5b14ef184d9ab8481d564be035130bc637599a3 100644
--- a/mobile/src/main/res/values-lt/strings.xml
+++ b/mobile/src/main/res/values-lt/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Vietų išplanavimai</string>
   <string name="mainmenu_openhab_preferences">Nustatymai</string>
-  <string name="mainmenu_openhab_selectsitemap">Pasirinkite numatytą vietos išplanavimą</string>
   <string name="mainmenu_openhab_clearcache">Išvalyti paveikslėlių podėlį</string>
   <!-- App settings strings -->
   <string name="settings_openhab_url">openHAB URL</string>
@@ -19,25 +18,17 @@
   <string name="settings_openhab_username">Vartotojo vardas</string>
   <string name="settings_openhab_password">Slaptažodis</string>
   <string name="settings_openhab_sslclientcert">Kliento SSL sertifikatas</string>
-  <string name="settings_openhab_sslclientcert_howto">Kaip naudoti kliento SSL sertifikatą</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Paspauskite čia, kad gautumėte informacijos, kaip nustatyti SSL autentifikaciją</string>
   <string name="settings_openhab_screentimeroff">Neleisti išjungti ekrano</string>
   <string name="settings_openhab_screentimeroff_summary">Neleisti išjungti ekrano, kol paleista openHAB programėlė</string>
   <string name="settings_openhab_demomode">Demonstracinis režimas</string>
   <string name="settings_openhab_demomode_summary">Naudoti openHAB programėlę demonstraciniu režimu</string>
   <string name="settings_openhab_theme">openHAB tema</string>
-  <string name="settings_openhab_sslcert">Netikrinti SSL sertifikato</string>
-  <string name="settings_openhab_sslcert_summary">Netikrinti SSL sertifikato validumo</string>
-  <string name="settings_openhab_sslhost">Netikrinti SSL hostname</string>
-  <string name="settings_openhab_sslhost_summary">Netikrinti serverio pavadinimo (hostname) užmezgant SSL ryšį</string>
   <string name="settings_openhab_fullscreen">Pilnas ekranas</string>
   <string name="settings_openhab_fullscreen_summary">Rodyti pilno ekrano režimu</string>
   <string name="settings_openhab_icon_format">Piktogramų formatas</string>
   <string name="settings_openhab_icon_format_png">Taškinis</string>
   <string name="settings_openhab_icon_format_svg">Vektorinis</string>
-  <string name="settings_clear_default_sitemap">Išvalyti numatytą vietos išplanavimą</string>
-  <string name="settings_no_default_sitemap">Nepasirinktas numatytas vietos išplanavimas</string>
-  <string name="settings_current_default_sitemap">Dabartinis numatytas vietos išplanavimas: %1$s</string>
   <!-- App messages strings -->
   <string name="info_voice_input">openHAB, jūsų paliepimu!</string>
   <string name="info_voice_recognized_text">Neatpažinta komanda: %1$s</string>
@@ -45,12 +36,9 @@
   <string name="info_conn_url">Jungiamasi prie sukonfigūruoto URL</string>
   <string name="info_conn_rem_url">Jungiamasi prie nuotolinio URL</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB grąžino tuščią vietos išplanavimų sąrašą</string>
   <string name="error_network_not_available">Tinklas nepasiekiamas</string>
   <string name="error_connection_failed">Nepavyko prisijungti prie serverio</string>
   <string name="error_unable_to_resolve_hostname">Nepavyko aptikti domeno vardo</string>
-  <string name="error_certificate_expired">SSL sertifikato galiojimas baigėsi. Gaukite naują sertifikatą arba išjunkite sertifikatų patvirtinimą</string>
-  <string name="error_certificate_revoked">SSL sertifikatas buvo atšauktas. Gaukite naują sertifikatą arba išjunkite sertifikato patvirtinimą</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
   <string name="error_http_code_496">Reikalingas SSL kliento sertifikatas (HTTP atsakymo kodas 496)</string>
   <string name="error_http_code_511">Reikalingas tinklo autentifikavimas (HTTP atsakymo kodas 511)</string>
@@ -69,8 +57,6 @@
   <string name="info_not_set">Nenustatyta</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Priimti nežinomą sertifikatą?</string>
-  <string name="mtm_decision_always">Visada</string>
   <string name="mtm_decision_once">Vieną kartą</string>
   <string name="mtm_decision_abort">Atšaukti</string>
   <string name="mtm_notification">Sertifikato patikrinimas</string>
@@ -94,20 +80,18 @@
   <!-- About -->
   <string name="about_title">Apie</string>
   <string name="about_license_title">Licencija</string>
-  <string name="settings_debug_messages_summary">Slaptažodžiai bus rodomi atviru tekstu!</string>
-  <string name="settings_debug_messages_title">Rodyti derinimo žinutes</string>
   <string name="error_couldnt_determine_openhab_url">Nepavyko nustatyti openHAB URL</string>
   <string name="unknown">Nežinoma</string>
   <string name="error_network_type_unsupported">Tinklo tipas (%s) nepalaikomas</string>
   <string name="set">Nustatyti</string>
   <string name="cancel">Atšaukti</string>
+  <!-- Content description for images -->
+  <!-- Intro strings -->
   <string name="app_intro">Intro</string>
   <string name="intro_welcome">Sveiki atvykę į openHAB</string>
   <string name="intro_whatis">Nepriklausomas atviro kodo išmanių namų sprendimas</string>
   <string name="intro_themes">Temos</string>
   <string name="intro_themes_description">Galite pasirinkti vieną iš kelių temų</string>
-  <!-- Content description for images -->
-  <!-- Intro strings -->
   <!-- Intro "SKIP" button -->
   <!-- Intro "DONE" button -->
 </resources>
diff --git a/mobile/src/main/res/values-nl/strings.xml b/mobile/src/main/res/values-nl/strings.xml
index 814a15339c78e949b7114aa15a27a3c2548f1b50..c03b41c6ce43587d4a049e293154b6c62c433930 100644
--- a/mobile/src/main/res/values-nl/strings.xml
+++ b/mobile/src/main/res/values-nl/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
   <string name="mainmenu_openhab_preferences">Instellingen</string>
-  <string name="mainmenu_openhab_selectsitemap">Selecteer standaard sitemap</string>
   <string name="mainmenu_openhab_clearcache">Verwijder afbeeldingscache</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">Verbindingsinstellingen</string>
@@ -22,26 +21,17 @@
   <string name="settings_openhab_username">Gebruikersnaam</string>
   <string name="settings_openhab_password">Wachtwoord</string>
   <string name="settings_openhab_sslclientcert">SSL-clientcertificaat</string>
-  <string name="settings_openhab_sslclientcert_howto">SSL-clientcertificaat how-to</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Tik hier voor enkele tips en uitleg over het instellen van SSL certificaat authenticatie</string>
   <string name="settings_openhab_screentimeroff">Uitschakelen weergave timer</string>
   <string name="settings_openhab_screentimeroff_summary">Zet het uitschakelen van het scherm uit als de openHAB App actief is</string>
   <string name="settings_openhab_demomode">Demonstratiemodus</string>
   <string name="settings_openhab_demomode_summary">Gebruik de openHAB App in demo modus</string>
   <string name="settings_openhab_theme">Thema</string>
-  <string name="settings_openhab_sslcert">Negeer SSL-certificaat</string>
-  <string name="settings_openhab_sslcert_summary">Negeer certificaatvalidatie tijdens SSL-verificatie</string>
-  <string name="settings_openhab_sslhost">Negeer SSL-hostnaam</string>
-  <string name="settings_openhab_sslhost_summary">Negeer hostnaam controller tijdens SSL-verificatie</string>
   <string name="settings_openhab_fullscreen">Volledig scherm</string>
   <string name="settings_openhab_fullscreen_summary">Gebruik volledige scherm</string>
   <string name="settings_openhab_icon_format">Pictogramindeling</string>
   <string name="settings_openhab_icon_format_png">Bitmap</string>
   <string name="settings_openhab_icon_format_svg">Vector</string>
-  <string name="settings_clear_default_sitemap">Vergeet standaard sitemap</string>
-  <string name="settings_no_default_sitemap">Geen standaard sitemap geselecteerd</string>
-  <string name="settings_current_default_sitemap">Huidige standaard sitemap: %1$s</string>
-  <string name="settings_openhab_sslsettings">Encryptie</string>
   <string name="settings_openhab_alt_connection">Extern</string>
   <string name="settings_openhab_connection">Lokaal</string>
   <!-- App messages strings -->
@@ -51,23 +41,13 @@
   <string name="info_conn_url">Verbinden met ingestelde URL</string>
   <string name="info_conn_rem_url">Verbinden naar externe URL</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB heeft een lege sitemap geladen</string>
   <string name="error_network_not_available">Netwerk is niet beschikbaar</string>
-  <string name="error_http_connection_failed">Verbinding mislukt. Een onverwachte reactie werd ontvangen tijdens het maken van een verbinding met de geconfigureerde openHAB server (ontvangen HTTP-reactiecode: %d)</string>
   <string name="error_invalid_url">Voer een geldige URL in, formaat \'http(s)://host(:port)/\'</string>
   <string name="error_connection_failed">Verbinding met host mislukt</string>
   <string name="error_unable_to_resolve_hostname">Hostnaam niet gevonden</string>
   <string name="error_connection_sslhandshake_failed">SSL-handshake mislukt</string>
-  <string name="error_certificate_expired">SSL-certificaat is verlopen. Voeg een nieuw certificaat toe of schakel validatie tijdens SSL handshake uit</string>
-  <string name="error_certificate_revoked">SSL-certificaat is ingetrokken. Voeg een nieuw certificaat toe of schakel de validatie tijdens de SSL handdruk uit</string>
   <string name="error_certificate_wrong_host">SSL-certificaat is niet geldig voor %s</string>
-  <string name="error_http_code_401">Verificatie is mislukt. Controleer de geconfigureerde gebruikersnaam en wachtwoord respectievelijk het verstrekte SSL-clientcertificaat (HTTP-reactiecode 401)</string>
-  <string name="error_http_code_403">Verificatie is mislukt. Controleer de geconfigureerde gebruikersnaam en wachtwoord respectievelijk het verstrekte SSL-clientcertificaat (HTTP-reactiecode 403)</string>
-  <string name="error_http_code_407">Verificatie is mislukt. Controleer de geconfigureerde gebruikersnaam en wachtwoord respectievelijk het verstrekte SSL-clientcertificaat (HTTP-reactiecode 407)</string>
-  <string name="error_http_code_414">URL is te lang. Gebruik het IP-adres of een kortere URL (HTTP-reactiecode 414)</string>
-  <string name="error_http_code_426">HTTPS is vereist. Wijzig de URL (HTTP-reactiecode 426)</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Verificatie is mislukt. Controleer het verstrekte SSL-clientcertificaat (HTTP-reactiecode 495)</string>
   <string name="error_http_code_496">SSL-clientcertificaat is vereist (HTTP responscode 496)</string>
   <string name="error_http_code_502">De reverse proxy heeft een ongeldig antwoord van de openHAB server ontvangen (HTTP-reactiecode 502)</string>
   <string name="error_http_code_503">De openHAB server is tijdelijk niet beschikbaar (HTTP-reactiecode 503)</string>
@@ -90,8 +70,6 @@
   <string name="info_not_set">Niet ingesteld</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Onbekend certificaat accepteren?</string>
-  <string name="mtm_decision_always">Altijd</string>
   <string name="mtm_decision_once">Eenmalig</string>
   <string name="mtm_decision_abort">Afbreken</string>
   <string name="mtm_notification">Certificaatverificatie</string>
@@ -124,19 +102,12 @@
   <string name="about_community">openHAB community</string>
   <string name="about_server">openHAB server</string>
   <string name="about_translation">Help ons met het vertalen van openHAB</string>
-  <string name="settings_debug_messages_summary">Wachtwoorden worden in leesbare tekst getoond!</string>
-  <string name="settings_debug_messages_title">Foutopsporingsberichten weergeven</string>
   <string name="error_couldnt_determine_openhab_url">openHAB URL kon niet worden vastgesteld</string>
   <string name="unknown">Onbekend</string>
   <string name="error_network_type_unsupported">Netwerktype (%s) wordt niet ondersteund</string>
   <string name="set">Stel in</string>
   <string name="cancel">Annuleer</string>
   <string name="close">Sluiten</string>
-  <string name="app_intro">Introductie</string>
-  <string name="intro_welcome">Welkom bij openHAB</string>
-  <string name="intro_whatis">Leverancier en technologie onafhankelijke open source domotica software voor jouw huis</string>
-  <string name="intro_themes">Thema\'s</string>
-  <string name="intro_themes_description">Kies tussen de verschillende thema\'s</string>
   <string name="try_again_button">Opnieuw proberen</string>
   <string name="go_to_settings_button">Ga naar instellingen</string>
   <string name="resolving_openhab">Proberen om openHAB server automatisch te vinden\u2026</string>
@@ -152,6 +123,11 @@
   <string name="content_description_open_openhab">Open openHAB</string>
   <string name="swipe_to_refresh_dismiss">Begrepen!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Introductie</string>
+  <string name="intro_welcome">Welkom bij openHAB</string>
+  <string name="intro_whatis">Leverancier en technologie onafhankelijke open source domotica software voor jouw huis</string>
+  <string name="intro_themes">Thema\'s</string>
+  <string name="intro_themes_description">Kies tussen de verschillende thema\'s</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">OVERSLAAN</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-pl/strings.xml b/mobile/src/main/res/values-pl/strings.xml
index 13f1ae9d455841575a429f45e6b6a467f470e612..988d82c28834821d8bba86b269564086651191b6 100644
--- a/mobile/src/main/res/values-pl/strings.xml
+++ b/mobile/src/main/res/values-pl/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Mapy witryn</string>
   <string name="mainmenu_openhab_preferences">Ustawienia</string>
-  <string name="mainmenu_openhab_selectsitemap">Wybierz domyślną mapę witryny</string>
   <string name="mainmenu_openhab_clearcache">Wyczyść obrazy pamięci podręcznej</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">Ustawienia połączenia</string>
@@ -22,26 +21,17 @@
   <string name="settings_openhab_username">Nazwa użytkownika</string>
   <string name="settings_openhab_password">Hasło</string>
   <string name="settings_openhab_sslclientcert">Certyfikat klienta SSL</string>
-  <string name="settings_openhab_sslclientcert_howto">Certyfikat klienta SSL pomoc</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Naciśnij tutaj, aby uzyskać kilka wskazówek i wyjaśnień o tym, jak skonfigurować autoryzację certyfikatu klienta SSL</string>
   <string name="settings_openhab_screentimeroff">Wyłącz wyświetlanie zegara</string>
   <string name="settings_openhab_screentimeroff_summary">Wyłącz wyświetlanie wyłącznik zegara, kiedy openHAB jest włączony</string>
   <string name="settings_openhab_demomode">Wersja demonstracyjna</string>
   <string name="settings_openhab_demomode_summary">Uruchom w trybie demonstracyjnym</string>
   <string name="settings_openhab_theme">Motyw</string>
-  <string name="settings_openhab_sslcert">Ignoruj certyfikat SSL</string>
-  <string name="settings_openhab_sslcert_summary">Ignoruj sprawdzenie poprawności certyfikatu podczas uzgadniania SSL</string>
-  <string name="settings_openhab_sslhost">Ignoruj nazwę hosta SSL</string>
-  <string name="settings_openhab_sslhost_summary">Ignoruj sprawdzanie nazwy hosta podczas uzgadniania SSL</string>
   <string name="settings_openhab_fullscreen">Pełny ekran</string>
   <string name="settings_openhab_fullscreen_summary">Wyświetl w trybie pełnego ekranu</string>
   <string name="settings_openhab_icon_format">Format ikon</string>
   <string name="settings_openhab_icon_format_png">Mapa bitowa</string>
   <string name="settings_openhab_icon_format_svg">Wektor</string>
-  <string name="settings_clear_default_sitemap">Wyczyść domyślną mapę witryn</string>
-  <string name="settings_no_default_sitemap">Nie wybrano domyślnej mapy witryn</string>
-  <string name="settings_current_default_sitemap">Obecna domyślna mapa witryn: %1$s</string>
-  <string name="settings_openhab_sslsettings">Szyfrowanie</string>
   <string name="settings_openhab_alt_connection">Ustawienia serwera zdalnego</string>
   <string name="settings_openhab_connection">Ustawienia serwera lokalnego</string>
   <!-- App messages strings -->
@@ -51,23 +41,13 @@
   <string name="info_conn_url">Łączenie z lokalnym URL</string>
   <string name="info_conn_rem_url">Łączenie ze zdalnym adresem URL</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB zwrócił pustą listę map witryn</string>
   <string name="error_network_not_available">Sieć jest niedostępna</string>
-  <string name="error_http_connection_failed">Otrzymano nieprawidłową odpowiedź od openHAB. Proszę sprawdzić, czy openHAB działa poprawnie (kod odpowiedzi HTTP %d)</string>
   <string name="error_invalid_url">Proszę wprowadź poprawny adres URL w formie \'protokół://host:port/\'</string>
   <string name="error_connection_failed">Połączenie z hostem nie powiodło się</string>
   <string name="error_unable_to_resolve_hostname">Nie można określić nazwy hosta</string>
   <string name="error_connection_sslhandshake_failed">Uzgadnianie SSL nie powiodło się - może potrzebujesz właściwego certyfikatu klienta</string>
-  <string name="error_certificate_expired">Certyfikat SSL jest przestarzały. Proszę uzyskaj nowy certyfikat lub wyłącz sprawdzanie poprawności certyfikatu podczas uzgadniania SSL</string>
-  <string name="error_certificate_revoked">Certyfikat SSL został unieważniony. Proszę uzyskaj nowy certyfikat lub wyłącz sprawdzanie poprawności certyfikatu podczas uzgadniania SSL</string>
   <string name="error_certificate_wrong_host">Certyfikat SSL dla %s jest nieprawidłowy</string>
-  <string name="error_http_code_401">Autoryzacja użytkownika nie powiodła się. Sprawdź nazwę użytkownika, hasło i certyfikat klienta SSL (kod błędu HTTP 401)</string>
-  <string name="error_http_code_403">Autoryzacja użytkownika nie powiodła się. Sprawdź nazwę użytkownika, hasło i certyfikat klienta SSL (kod odpowiedzi HTTP 403)</string>
-  <string name="error_http_code_407">Autoryzacja użytkownika nie powiodła się. Sprawdź nazwę użytkownika, hasło i certyfikat klienta SSL (kod odpowiedzi HTTP 407)</string>
-  <string name="error_http_code_414">Adres URL jest zbyt długi (kod odpowiedzi HTTP 414)</string>
-  <string name="error_http_code_426">HTTPS jest wymagany. Zmień adres URL openHAB (kod odpowiedzi HTTP 426)</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Nieprawidłowy certyfikat klienta SSL (kod odpowiedzi HTTP 495)</string>
   <string name="error_http_code_496">Certyfikat klienta SSL jest wymagany (kod odpowiedzi HTTP 496)</string>
   <string name="error_http_code_502">Twój odwrócony serwer proxy otrzymał nieprawidłową odpowiedź od openHAB (kod odpowiedzi HTTP 502)</string>
   <string name="error_http_code_503">openHAB jest tymczasowo niedostępny (kod odpowiedzi HTTP 503)</string>
@@ -89,8 +69,6 @@
   <string name="info_not_set">Nie ustawiono</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Akceptować nieznany Certyfikat?</string>
-  <string name="mtm_decision_always">Zawsze</string>
   <string name="mtm_decision_once">Jednorazowo</string>
   <string name="mtm_decision_abort">Anuluj</string>
   <string name="mtm_notification">Weryfikacja certyfikatu</string>
@@ -123,18 +101,11 @@
   <string name="about_community">Społeczność openHAB</string>
   <string name="about_server">Serwer openHAB</string>
   <string name="about_translation">Pomóż nam tłumaczyć openHAB</string>
-  <string name="settings_debug_messages_summary">Hasła będą wyświetlane w postaci zwykłego tekstu!</string>
-  <string name="settings_debug_messages_title">Pokaż komunikaty debugowania</string>
   <string name="error_couldnt_determine_openhab_url">Nie można określić adresu URL openHAB</string>
   <string name="unknown">Nieznane</string>
   <string name="error_network_type_unsupported">Typ sieci (%s) nie jest wspierany</string>
   <string name="set">Wybierz</string>
   <string name="cancel">Anuluj</string>
-  <string name="app_intro">Wprowadzenie</string>
-  <string name="intro_welcome">Witaj w openHAB</string>
-  <string name="intro_whatis">Otwarte oprogramowanie do automatyzacji Twojego domu</string>
-  <string name="intro_themes">Motywy</string>
-  <string name="intro_themes_description">Wybierz spośród wielu motywów</string>
   <string name="try_again_button">Spróbuj ponownie</string>
   <string name="go_to_settings_button">Przejdź do ustawień</string>
   <!-- Content description for images -->
@@ -149,6 +120,11 @@
   <string name="content_description_open_openhab">Otwórz openHAB</string>
   <string name="swipe_to_refresh_dismiss">Rozumiem!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Wprowadzenie</string>
+  <string name="intro_welcome">Witaj w openHAB</string>
+  <string name="intro_whatis">Otwarte oprogramowanie do automatyzacji Twojego domu</string>
+  <string name="intro_themes">Motywy</string>
+  <string name="intro_themes_description">Wybierz spośród wielu motywów</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">POMIŃ</string>
   <!-- Intro "DONE" button -->
diff --git a/mobile/src/main/res/values-pt-rBR/strings.xml b/mobile/src/main/res/values-pt-rBR/strings.xml
index 559c07f08fa6473c4a0dc92b6c431f5e51a253fa..e259f7be5eb1ed261f457891285c35f4d2a87043 100644
--- a/mobile/src/main/res/values-pt-rBR/strings.xml
+++ b/mobile/src/main/res/values-pt-rBR/strings.xml
@@ -22,17 +22,12 @@
   <string name="settings_openhab_username">Usuário</string>
   <string name="settings_openhab_password">Senha</string>
   <string name="settings_openhab_sslclientcert">Certificado cliente SSL</string>
-  <string name="settings_openhab_sslclientcert_howto">Certificado cliente SSL Ajuda</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Toque aqui para obter algumas dicas e explicações sobre como configurar a autenticação de certificado cliente SSL</string>
   <string name="settings_openhab_screentimeroff">Desativar a exibição do timer</string>
   <string name="settings_openhab_screentimeroff_summary">Desativa a exibição de interruptor de temporização quando openHAB está sendo executado</string>
   <string name="settings_openhab_demomode">Modo de demonstração</string>
   <string name="settings_openhab_demomode_summary">Executar em modo de demonstração</string>
   <string name="settings_openhab_theme">Tema</string>
-  <string name="settings_openhab_sslcert">Ignorar o certificado SSL</string>
-  <string name="settings_openhab_sslcert_summary">Ignorar validação de certificados durante o handshake SSL</string>
-  <string name="settings_openhab_sslhost">Ignorar o nome de host SSL</string>
-  <string name="settings_openhab_sslhost_summary">Ignorar verificação de hostname durante o handshake SSL</string>
   <string name="settings_openhab_fullscreen">Tela cheia</string>
   <string name="settings_openhab_fullscreen_summary">Exibir no modo de tela cheia</string>
   <string name="settings_openhab_icon_format">Formato de ícone</string>
@@ -45,10 +40,10 @@
   <string name="settings_chart_scaling_value_m">Padrão</string>
   <string name="settings_chart_scaling_value_l">Grande</string>
   <string name="settings_ringtone">Toque de notificação</string>
-  <string name="settings_clear_default_sitemap">Selecione o sitemap padrão</string>
-  <string name="settings_no_default_sitemap">Sitemap padrão não selecionado</string>
-  <string name="settings_current_default_sitemap">Sitemap padrão atual: %1$s</string>
-  <string name="settings_openhab_sslsettings">Criptografia</string>
+  <string name="settings_ringtone_none">Nenhum</string>
+  <string name="settings_clear_default_sitemap">Limpar o sitemap padrão</string>
+  <string name="settings_no_default_sitemap">Nenhum Sitemap selecionado</string>
+  <string name="settings_current_default_sitemap">Atual Sitemap padrão: %1$s</string>
   <string name="settings_openhab_alt_connection">Remoto</string>
   <string name="settings_openhab_connection">Local</string>
   <string name="settings_notification_vibration">Vibração de notificação</string>
@@ -56,6 +51,8 @@
   <string name="settings_notification_vibration_short">Curta</string>
   <string name="settings_notification_vibration_long">Longa</string>
   <string name="settings_notification_vibration_twice">Dupla</string>
+  <string name="settings_connection_summary">Conectado a %s</string>
+  <string name="settings_insecure_connection_summary">Conectado de forma insegura a %s</string>
   <!-- App messages strings -->
   <string name="title_voice_widget">comandos de voz do openHAB</string>
   <string name="info_voice_input">openHAB, às suas ordens!</string>
@@ -64,32 +61,33 @@
   <string name="info_conn_url">Conectando a URL local</string>
   <string name="info_conn_rem_url">Conectando a URL local</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB retornou uma lista de sitemap vazia</string>
+  <string name="error_empty_sitemap_list">openHAB retornou uma lista de Sitemap vazia</string>
   <string name="error_network_not_available">Rede não está disponivel</string>
-  <string name="error_http_connection_failed">Conexão sem sucesso. Foi recebida uma resposta inesperada ao conectar com servidor openHAB configurado (código de resposta HTTP recebido: %d)</string>
+  <string name="error_http_connection_failed">Conexão sem sucesso. Foi recebida uma resposta inesperada ao conectar com servidor openHAB configurado (código de resposta HTTP recebido: %d).</string>
   <string name="error_invalid_url">Por favor insira uma URL válida num padrão \'http(s)://endereço(:porta)/\'</string>
   <string name="error_connection_failed">Conexão ao host falhou</string>
   <string name="error_unable_to_resolve_hostname">Não foi possível resolver o hostname</string>
   <string name="error_connection_sslhandshake_failed">Handshake SSL falhou</string>
-  <string name="error_certificate_not_trusted">Certificado SSL não é confiável. Por favor, importe o certificado raiz ou desabilite a validação de certificados durante o handshake SSL</string>
-  <string name="error_certificate_expired">Certificado SLL expirou. Por favor, obtenha um novo certificado ou desabilite a validação de certificado durante o handshake SSL</string>
-  <string name="error_certificate_not_valid_yet">Certificado SSL ainda não é válido. Por favor, obtenha um certificado correto ou desabilite a validação de certificados durante o handshake SSL. Verifique também se o relógio no seu telefone está configurado corretamente</string>
-  <string name="error_certificate_revoked">Certificado SLL foi revogado. Por favor, obter um novo certificado ou desabilitar a validação de certificado durante o handshake SSL</string>
+  <string name="error_certificate_not_trusted">Certificado SSL não é confiável. Por favor, importe o certificado raiz ou desabilite a validação de certificados durante o handshake SSL.</string>
+  <string name="error_certificate_expired">Certificado SLL expirou. Por favor, obtenha um novo certificado ou desabilite a validação de certificado durante o handshake SSL.</string>
+  <string name="error_certificate_not_valid_yet">Certificado SSL não é válido ainda. Por favor, obtenha um certificado correto ou desabilite a validação de certificados durante o handshake SSL. Verifique também se o relógio no seu telefone está configurado corretamente.</string>
+  <string name="error_certificate_revoked">Certificado SLL foi revogado. Por favor, obtenha um novo certificado ou aceite o certificado durante o handshake SSL.</string>
   <string name="error_certificate_wrong_host">Certificado SSL não é válido para %s</string>
-  <string name="error_http_code_401">Falha de autenticação. Por favor, verifique o usuário e senha configurada e o certificado SSL do cliente fornecido (código de resposta HTTP 401)</string>
-  <string name="error_http_code_403">Falha de autenticação. Por favor, verifique o usuário e senha configurada e o certificado SSL do cliente fornecido (código de resposta HTTP 403)</string>
-  <string name="error_http_code_407">Falha de autenticação. Por favor, verifique o usuário e senha configurada e o certificado SSL do cliente fornecido (código de resposta HTTP 407)</string>
-  <string name="error_http_code_414">URL é muito longa. Por favor, use o endereço IP ou uma URL mais curta (código de resposta HTTP 414)</string>
-  <string name="error_http_code_426">É necessário utilizar HTTPS. Por favor, altere a URL (HTTP código de resposta 426)</string>
+  <string name="error_http_code_401">Falha de autenticação. Por favor, verifique o usuário e senha configurada e o certificado SSL do cliente fornecido (código de resposta HTTP 401).</string>
+  <string name="error_http_code_403">Falha de autenticação. Por favor, verifique o usuário e senha configurada e o certificado SSL do cliente fornecido (código de resposta HTTP 403).</string>
+  <string name="error_http_code_407">Falha de autenticação. Por favor, verifique o usuário e senha configurada e o certificado SSL do cliente fornecido (código de resposta HTTP 407).</string>
+  <string name="error_http_code_414">URL é muito longa. Por favor, use o endereço IP ou uma URL mais curta (código de resposta HTTP 414).</string>
+  <string name="error_http_code_426">É necessário utilizar HTTPS. Por favor, altere a URL (HTTP código de resposta 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Autenticação de usuário falhou. Por favor, verifique o nome de usuário, senha e certificado de cliente SSL (HTTP código de resposta 495)</string>
+  <string name="error_http_code_495">Autenticação falhou. Por favor, verifique o nome de usuário, senha e certificado de cliente SSL (HTTP código de resposta 495).</string>
   <string name="error_http_code_496">Certificado de cliente SSL é necessário (HTTP código de resposta 496)</string>
   <string name="error_http_code_502">O seu proxy reverso recebeu uma resposta inválida do servidor openHAB (HTTP código de resposta 502)</string>
   <string name="error_http_code_503">O servidor openHAB está temporariamente indisponível (HTTP código de resposta 503)</string>
-  <string name="error_http_code_504">Tempo expirado do gateway. Parece que o seu proxy reverso está rodando, mas não foi possível obter uma resposta do servidor openHAB (código de resposta HTTP 504)</string>
+  <string name="error_http_code_504">Tempo expirado do gateway. Parece que o seu proxy reverso está rodando, mas não foi possível obter uma resposta do servidor openHAB (código de resposta HTTP 504).</string>
   <string name="error_http_code_507">O servidor openHAB não tem espaço livre suficiente (HTTP código de resposta 507)</string>
   <string name="error_http_code_511">Autenticação de rede é necessária (HTTP código de resposta 511)</string>
   <string name="error_about_no_conn">Erro ao buscar informações do servidor openHAB</string>
+  <string name="error_openhab_offline">Seu servidor openHAB está offline enquanto está executando a instância de nuvem</string>
   <string name="title_activity_openhabwritetag">Escrever na tag NFC</string>
   <string name="title_activity_libraries">Bibliotecas usadas</string>
   <string name="info_write_tag">Toque na tag e a mantenha perto até aparecer a mensagem de confirmação</string>
@@ -111,7 +109,13 @@
   <string name="list_loading_message">Carregando\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
   <string name="mtm_accept_cert">Aceitar Certificado desconhecido?</string>
-  <string name="mtm_decision_always">Sempre</string>
+  <string name="mtm_trust_anchor">O certificado do servidor não é assinado por uma autoridade de certificado reconhecida</string>
+  <string name="mtm_cert_expired">O certificado do servidor expirou</string>
+  <string name="mtm_accept_servername">Aceitar o nome do servidor incompatível?</string>
+  <string name="mtm_hostname_mismatch">Servidor não pode autenticar como \&quot;%s\&quot;. O certificado é válido apenas para:</string>
+  <string name="mtm_connect_anyway">Você deseja conectar mesmo assim?</string>
+  <string name="mtm_cert_details">Informações do certificado:</string>
+  <string name="mtm_decision_always">Aceitar</string>
   <string name="mtm_decision_once">Uma só vez</string>
   <string name="mtm_decision_abort">Anular</string>
   <string name="mtm_notification">Verificação de certificado</string>
@@ -130,7 +134,7 @@
   <string name="nfc_action_toggle">Alternar</string>
   <string name="nfc_activate">Ativar</string>
   <string name="nfc_action_current_color">Cor atual</string>
-  <string name="nfc_action_to_sitemap_page">Navegar para a página do sitemap</string>
+  <string name="nfc_action_to_sitemap_page">Navegar para a página do Sitemap</string>
   <!-- Drawer -->
   <string name="drawer_open">Gaveta aberta do sitemap</string>
   <string name="drawer_close">Gaveta fechada do sitemap</string>
@@ -148,22 +152,17 @@
   <string name="about_server">servidor openHAB</string>
   <string name="about_translation">Nos ajude a traduzir o openHAB</string>
   <string name="about_privacy_policy">Política de privacidade</string>
-  <string name="settings_debug_messages_summary">As senhas serão mostradas em texto não criptografado!</string>
-  <string name="settings_debug_messages_title">Mostrar mensagens de depuração</string>
+  <string name="settings_debug_messages_title">Mostrar informações para solução de problemas</string>
   <string name="error_couldnt_determine_openhab_url">Não consegui determinar a URL do openHAB</string>
   <string name="unknown">Desconhecido</string>
   <string name="error_network_type_unsupported">Tipo de rede (%s) não suportado</string>
   <string name="set">Definir</string>
   <string name="cancel">Cancelar</string>
   <string name="close">Fechar</string>
-  <string name="app_intro">Introdução</string>
-  <string name="intro_welcome">Bem-vindo ao openHAB</string>
-  <string name="intro_whatis">Um software agnóstico e fornecedor de automatização de software aberto para a sua casa</string>
-  <string name="intro_themes">Temas</string>
-  <string name="intro_themes_description">Escolha entre vários temas</string>
   <string name="try_again_button">Tente novamente</string>
   <string name="go_to_settings_button">Ir para Configurações</string>
   <string name="configuration_missing">Seu servidor openHAB não pôde ser descoberto automaticamente. Por favor, configure seu nome de host ou endereço IP nas configurações do servidor.</string>
+  <string name="no_remote_server">Rede local não está disponível e você não tem um servidor remoto configurado</string>
   <string name="resolving_openhab">Tentando descobrir uma instância do servidor openHAB\u2026</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">Abrir cortina</string>
@@ -178,11 +177,16 @@
   <string name="swipe_to_refresh_description">A aplicação também atualiza automaticamente, normalmente não necessita fazer manualmente</string>
   <string name="swipe_to_refresh_dismiss">Entendido!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Introdução</string>
+  <string name="intro_welcome">Bem-vindo ao openHAB</string>
+  <string name="intro_whatis">Um software agnóstico e fornecedor de automatização de software aberto para a sua casa</string>
+  <string name="intro_themes">Temas</string>
+  <string name="intro_themes_description">Escolha entre vários temas</string>
+  <string name="intro_voice_description">Controle sua casa com a sua voz</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">O controle de item pode ser vinculado a tags NFC pressionando por um longo tempo o item</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">Pular</string>
   <!-- Intro "DONE" button -->
   <string name="app_intro_done_button">Concluído</string>
-  <string name="intro_voice_description">Controle sua casa com a sua voz</string>
-  <string name="intro_nfc">NFC</string>
-  <string name="intro_nfc_description">O controle de item pode ser vinculado a tags NFC pressionando por um longo tempo</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt/strings.xml b/mobile/src/main/res/values-pt/strings.xml
index 027014c3a3f9ac0b175cd4c6af8fd2d2d52c7ef3..b9c62ff7ebab12a3c649506c299c54ea64f1419c 100644
--- a/mobile/src/main/res/values-pt/strings.xml
+++ b/mobile/src/main/res/values-pt/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Mapa do site</string>
   <string name="mainmenu_openhab_preferences">Configurações</string>
-  <string name="mainmenu_openhab_selectsitemap">Selecione o mapa do site padrão</string>
   <string name="mainmenu_openhab_clearcache">Limpar cache das imagens</string>
   <!-- App settings strings -->
   <string name="settings_openhab_url">URL do servidor local</string>
@@ -19,25 +18,17 @@
   <string name="settings_openhab_username">Nome de utilizador</string>
   <string name="settings_openhab_password">Palavra passe</string>
   <string name="settings_openhab_sslclientcert">Certificado de cliente SSL</string>
-  <string name="settings_openhab_sslclientcert_howto">Certificado de cliente SSL How-to</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Toque aqui para obter algumas dicas e explicações sobre como configurar a autenticação de certificado de cliente SSL</string>
   <string name="settings_openhab_screentimeroff">Desativar a exibição do temporizador</string>
   <string name="settings_openhab_screentimeroff_summary">Desativar exibição do interruptor de temporização quando openHAB está a ser executado</string>
   <string name="settings_openhab_demomode">Modo de demonstração</string>
   <string name="settings_openhab_demomode_summary">Executar em modo de demonstração</string>
   <string name="settings_openhab_theme">Tema</string>
-  <string name="settings_openhab_sslcert">Ignorar o certificado SSL</string>
-  <string name="settings_openhab_sslcert_summary">Ignorar a validação de certificados durante o handshake SSL</string>
-  <string name="settings_openhab_sslhost">Ignorar o nome de host SSL</string>
-  <string name="settings_openhab_sslhost_summary">Ignorar verificação de hostname durante o handshake SSL</string>
   <string name="settings_openhab_fullscreen">Ecrã inteiro</string>
   <string name="settings_openhab_fullscreen_summary">Exibir no modo de ecrã inteiro</string>
   <string name="settings_openhab_icon_format">Formato de icone</string>
   <string name="settings_openhab_icon_format_png">Bitmap</string>
   <string name="settings_openhab_icon_format_svg">Vetor</string>
-  <string name="settings_clear_default_sitemap">Selecione o mapa do site padrão</string>
-  <string name="settings_no_default_sitemap">Mapa do site padrão não selecionado</string>
-  <string name="settings_current_default_sitemap">Mapa do site padrão atual: %1$s</string>
   <!-- App messages strings -->
   <string name="info_voice_input">openhab, às suas ordens!</string>
   <string name="info_voice_recognized_text">Comando reconhecido: %1$s</string>
@@ -45,12 +36,9 @@
   <string name="info_conn_url">Conectando a URL local</string>
   <string name="info_conn_rem_url">Conectando a URL local</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openhab lista do mapa do site retornou vazia</string>
   <string name="error_network_not_available">Rede não está disponivel</string>
   <string name="error_connection_failed">Conexão ao host falhado</string>
   <string name="error_unable_to_resolve_hostname">Não foi possível resolver nome de anfitrião</string>
-  <string name="error_certificate_expired">Certificado SLL expirou. Por favor, obter um novo certificado ousesabilitar a validação de certificado durante o handshake SSL</string>
-  <string name="error_certificate_revoked">Certificado SLL foi revogado. Por favor, obter um novo certificado ou desabilitar a validação de certificado durante o handshake SSL</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
   <string name="error_http_code_496">Certificado de cliente SSL é necessário (HTTP código de resposta 496)</string>
   <string name="error_http_code_511">Autenticação de rede é necessária (HTTP código de resposta 511)</string>
@@ -69,8 +57,6 @@
   <string name="info_not_set">Não definido</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Aceitar Certificado desconhecido?</string>
-  <string name="mtm_decision_always">Sempre</string>
   <string name="mtm_decision_once">Uma só vez</string>
   <string name="mtm_decision_abort">Anular</string>
   <string name="mtm_notification">Verificação de certificado</string>
@@ -95,20 +81,18 @@
   <!-- About -->
   <string name="about_title">Sobre</string>
   <string name="about_license_title">Licença</string>
-  <string name="settings_debug_messages_summary">As senhas serão mostradas em texto não criptografado!</string>
-  <string name="settings_debug_messages_title">Mostrar mensagens de depuração</string>
   <string name="error_couldnt_determine_openhab_url">Não consegui determinar o URL openHAB</string>
   <string name="unknown">Desconhecido</string>
   <string name="error_network_type_unsupported">Tipo de rede (%s) não suportado</string>
   <string name="set">Conjunto</string>
   <string name="cancel">Cancelar</string>
+  <!-- Content description for images -->
+  <!-- Intro strings -->
   <string name="app_intro">Introdução</string>
   <string name="intro_welcome">Bem-vindo ao openHAB</string>
   <string name="intro_whatis">Um software agnóstico e vendedor de automatização de software aberto para a sua casa</string>
   <string name="intro_themes">Temas</string>
   <string name="intro_themes_description">Escolha entre vários temas</string>
-  <!-- Content description for images -->
-  <!-- Intro strings -->
   <!-- Intro "SKIP" button -->
   <!-- Intro "DONE" button -->
 </resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index 17b87488f64a812054266d294a1b5f9602e3d159..d62e1c7eae0b1a94719f751fd05cdcdf2bbea739 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -22,17 +22,12 @@
   <string name="settings_openhab_username">Пользователь</string>
   <string name="settings_openhab_password">Пароль</string>
   <string name="settings_openhab_sslclientcert">SSL сертификат клиента</string>
-  <string name="settings_openhab_sslclientcert_howto">Руководство по SSL сертификату клиента</string>
   <string name="settings_openhab_sslclientcert_howto_summary">Коснитесь здесь, чтобы получить подсказки по настройке SSL-сертификата клиента</string>
   <string name="settings_openhab_screentimeroff">Отключить таймер дисплея</string>
   <string name="settings_openhab_screentimeroff_summary">Дисплей всегда включен при запущенном openHAB</string>
   <string name="settings_openhab_demomode">Демо режим</string>
   <string name="settings_openhab_demomode_summary">Запуск демо режима</string>
   <string name="settings_openhab_theme">Тема</string>
-  <string name="settings_openhab_sslcert">Игнорировать SSL сертификат</string>
-  <string name="settings_openhab_sslcert_summary">Игнорировать проверку сертификата во время установки SSL-соединения</string>
-  <string name="settings_openhab_sslhost">Игнорировать SSL-имя хоста</string>
-  <string name="settings_openhab_sslhost_summary">Игнорировать проверку имени хоста во время установления SSL-соединения</string>
   <string name="settings_openhab_fullscreen">Во весь экран</string>
   <string name="settings_openhab_fullscreen_summary">Показать во весь экран</string>
   <string name="settings_openhab_icon_format">Формат иконок</string>
@@ -45,12 +40,19 @@
   <string name="settings_chart_scaling_value_m">По умолчанию</string>
   <string name="settings_chart_scaling_value_l">Большой</string>
   <string name="settings_ringtone">Звук уведомления</string>
+  <string name="settings_ringtone_none">Без рингтона</string>
   <string name="settings_clear_default_sitemap">Очистить sitemap по умолчанию</string>
-  <string name="settings_no_default_sitemap">Sitemap по умолчанию не выбран</string>
+  <string name="settings_no_default_sitemap">Не выбран Sitemap по умолчанию</string>
   <string name="settings_current_default_sitemap">Текущий sitemap по умолчанию: %1$s</string>
-  <string name="settings_openhab_sslsettings">Параметры шифрования</string>
   <string name="settings_openhab_alt_connection">Удаленный сервер</string>
   <string name="settings_openhab_connection">Локальный сервер</string>
+  <string name="settings_notification_vibration">Вибрация при уведомлениях</string>
+  <string name="settings_notification_vibration_off">Выкл</string>
+  <string name="settings_notification_vibration_short">Коротко</string>
+  <string name="settings_notification_vibration_long">Длинно</string>
+  <string name="settings_notification_vibration_twice">Дважды</string>
+  <string name="settings_connection_summary">Подключен к %s</string>
+  <string name="settings_insecure_connection_summary">Подключен к %s без проверки безопасности</string>
   <!-- App messages strings -->
   <string name="title_voice_widget">Голосовые команды openHAB</string>
   <string name="info_voice_input">openHAB, Ваша команда!</string>
@@ -61,30 +63,31 @@
   <!-- Error messages -->
   <string name="error_empty_sitemap_list">openHAB вернул пустой список sitemap</string>
   <string name="error_network_not_available">Сеть недоступна</string>
-  <string name="error_http_connection_failed">Ошибка подключения. Получен неверный ответ от openHAB. Пожалуйста, проверьте, работает ли openHAB правильно (код ответа HTTP %d)</string>
+  <string name="error_http_connection_failed">Ошибка подключения. Получен неверный ответ от openHAB. Пожалуйста, проверьте, работает ли openHAB правильно (код ответа HTTP %d).</string>
   <string name="error_invalid_url">Пожалуйста, укажите правильный URL в формате \'http(s)://хост(:порт)/\'</string>
   <string name="error_connection_failed">Ошибка подключения к хосту</string>
   <string name="error_unable_to_resolve_hostname">Не удалось разрешить имя хоста</string>
   <string name="error_connection_sslhandshake_failed">Ошибка SSL соединения</string>
-  <string name="error_certificate_not_trusted">Сертификат SSL истек. Получите новый сертификат или отключите проверку сертификата SSL</string>
-  <string name="error_certificate_expired">Сертификат SSL истек. Получите новый сертификат или отключите проверку допустимости сертификата во время приовекри SSL</string>
-  <string name="error_certificate_not_valid_yet">Сертификат SSL недопустим. Получите корректный сертификат или отключите проверку сертификата SSL. Также проверьте, правильно ли установлены часы и часовой пояс на вашем устройстве</string>
-  <string name="error_certificate_revoked">Сертификат SSL был отклонен. Получите новый сертификат или отключите проверку сертификата SSL</string>
+  <string name="error_certificate_not_trusted">SSL-сертификат не является доверенным. Пожалуйста импортируйте корневой сертификат или подтвердите его во время SSL подключения.</string>
+  <string name="error_certificate_expired">Сертификат SSL истек. Получите новый сертификат или отключите проверку подлинности во время SSL подключения.</string>
+  <string name="error_certificate_not_valid_yet">Сертификат SSL недопустим. Получите корректный сертификат или отключите его проверку. Также проверьте, правильно ли установлены часы и часовой пояс на вашем устройстве.</string>
+  <string name="error_certificate_revoked">Сертификат SSL отклонен. Получите новый сертификат или отключите его проверку.</string>
   <string name="error_certificate_wrong_host">SSL сертификат не действителен для %s</string>
-  <string name="error_http_code_401">Ошибка аутентификации пользователя. Проверьте имя пользователя, пароль и сертификат клиента SSL (код ответа HTTP 401)</string>
-  <string name="error_http_code_403">Ошибка аутентификации пользователя. Проверьте имя пользователя, пароль и сертификат клиента SSL (код ответа HTTP 403)</string>
-  <string name="error_http_code_407">Ошибка аутентификации пользователя. Проверьте имя пользователя, пароль и сертификат клиента SSL (код ответа HTTP 407)</string>
-  <string name="error_http_code_414">URL-адрес openHAB слишком длинный. Пожалуйста используйте IP-адрес или сократите URL (код ответа HTTP 414)</string>
-  <string name="error_http_code_426">Требуется HTTPS. Измените URL адрес openHAB (код ответа HTTP 426)</string>
+  <string name="error_http_code_401">Ошибка аутентификации пользователя. Проверьте имя пользователя, пароль и сертификат клиента SSL (код ответа HTTP 401).</string>
+  <string name="error_http_code_403">Ошибка аутентификации пользователя. Проверьте имя пользователя, пароль и сертификат клиента SSL (код ответа HTTP 403).</string>
+  <string name="error_http_code_407">Ошибка аутентификации пользователя. Проверьте имя пользователя, пароль и сертификат клиента SSL (код ответа HTTP 407).</string>
+  <string name="error_http_code_414">URL-адрес openHAB слишком длинный. Пожалуйста используйте IP-адрес или сократите URL (код ответа HTTP 414).</string>
+  <string name="error_http_code_426">Требуется HTTPS. Измените URL-адрес openHAB (код ответа HTTP 426).</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
-  <string name="error_http_code_495">Ошибка авторизации. Неверный сертификат клиента SSL (код ответа HTTP 495)</string>
+  <string name="error_http_code_495">Ошибка авторизации. Неверный сертификат клиента SSL (код ответа HTTP 495).</string>
   <string name="error_http_code_496">Требуется сертификат SSL-клиента (код ответа HTTP 496)</string>
   <string name="error_http_code_502">Ваш прокси получил неверный ответ от openHAB (код ответа HTTP 502)</string>
   <string name="error_http_code_503">openHAB временно недоступен (код ответа HTTP 503)</string>
-  <string name="error_http_code_504">Тайм-аут шлюза. Кажется, что ваш обратный прокси работает, но не смог получить ответ от сервера openHAB (код ответа HTTP 504)</string>
+  <string name="error_http_code_504">Тайм-аут шлюза. Возможно, что ваш прокси-сервер работает, но не может получить ответ от сервера openHAB (код ответа HTTP 504).</string>
   <string name="error_http_code_507">Серверу openHAB недостаточно свободного места (код ответа HTTP 507)</string>
   <string name="error_http_code_511">Требуется сетевая аутентификация (код ответа HTTP 511)</string>
   <string name="error_about_no_conn">Ошибка при получении данных с сервера openHAB</string>
+  <string name="error_openhab_offline">Ваш сервер OpenHAB не доступен, но его экземпляр в облаке работает</string>
   <string name="title_activity_openhabwritetag">Запись NFC tag</string>
   <string name="title_activity_libraries">Используемые библиотеки</string>
   <string name="info_write_tag">Прикоснитесь к тегу и удерживайте его, пока не появится сообщение подтверждения</string>
@@ -106,7 +109,13 @@
   <string name="list_loading_message">Загрузка\u2026</string>
   <!-- Strings for MemorizingTrustManager activity -->
   <string name="mtm_accept_cert">Принять неизвестный сертификат?</string>
-  <string name="mtm_decision_always">Всегда</string>
+  <string name="mtm_trust_anchor">Сертификат не подписан авторизованным центром сертификации</string>
+  <string name="mtm_cert_expired">Срок действия сертификата истёк</string>
+  <string name="mtm_accept_servername">Имя сервера не совпадает. Принять?</string>
+  <string name="mtm_hostname_mismatch">Сервер не может проверить подлинность как \&quot;%s\&quot;. Сертификат действителен только для:</string>
+  <string name="mtm_connect_anyway">Все равно подключиться?</string>
+  <string name="mtm_cert_details">Данные сертификата:</string>
+  <string name="mtm_decision_always">Принять</string>
   <string name="mtm_decision_once">Один раз</string>
   <string name="mtm_decision_abort">Отмена</string>
   <string name="mtm_notification">Проверка сертификата</string>
@@ -143,22 +152,17 @@
   <string name="about_server">Сервер openHAB</string>
   <string name="about_translation">Помощь в переводе openHAB</string>
   <string name="about_privacy_policy">Политика конфиденциальности</string>
-  <string name="settings_debug_messages_summary">Пароль будет показан в открытом виде!</string>
-  <string name="settings_debug_messages_title">Показать отладочные сообщения</string>
+  <string name="settings_debug_messages_title">Cведения об устранении неполадок</string>
   <string name="error_couldnt_determine_openhab_url">Не удалось определить адрес openHAB</string>
   <string name="unknown">Неизвестно</string>
   <string name="error_network_type_unsupported">Тип сети (%s) не поддерживается</string>
   <string name="set">Установить</string>
   <string name="cancel">Отменить</string>
   <string name="close">Закрыть</string>
-  <string name="app_intro">Введение</string>
-  <string name="intro_welcome">Добро пожаловать в openHAB</string>
-  <string name="intro_whatis">Поставщик технологий с открытым исходным кодом для автоматизации \"умного дома\"</string>
-  <string name="intro_themes">Темы</string>
-  <string name="intro_themes_description">Переключение между разными темами</string>
   <string name="try_again_button">Попробуйте снова</string>
   <string name="go_to_settings_button">Перейти к настройкам</string>
   <string name="configuration_missing">Ваш сервер openHAB не был обнаружен автоматически. Пожалуйста, настройте его IP адрес или имя хоста в настройках сервера.</string>
+  <string name="no_remote_server">Локальная сеть недоступна и не настроен удаленный сервер</string>
   <string name="resolving_openhab">Пытаюсь обнаружить сервер openHAB\u2026</string>
   <!-- Content description for images -->
   <string name="content_description_open_roller_shutter">Открыть рольставни</string>
@@ -173,11 +177,16 @@
   <string name="swipe_to_refresh_description">Приложение также обновляется автоматически, обычно нет необходимости делать это вручную</string>
   <string name="swipe_to_refresh_dismiss">Ясно!</string>
   <!-- Intro strings -->
+  <string name="app_intro">Введение</string>
+  <string name="intro_welcome">Добро пожаловать в openHAB</string>
+  <string name="intro_whatis">Поставщик технологий с открытым исходным кодом для автоматизации \"умного дома\"</string>
+  <string name="intro_themes">Темы</string>
+  <string name="intro_themes_description">Переключение между разными темами</string>
+  <string name="intro_voice_description">Управляйте домом своим голосом</string>
+  <string name="intro_nfc">NFC</string>
+  <string name="intro_nfc_description">Элемент управления может быть привязан к NFC тегам долгим нажатием на этот элемент</string>
   <!-- Intro "SKIP" button -->
   <string name="app_intro_skip_button">ПРОПУСТИТЬ</string>
   <!-- Intro "DONE" button -->
   <string name="app_intro_done_button">ГОТОВО</string>
-  <string name="intro_voice_description">Управляйте домом своим голосом</string>
-  <string name="intro_nfc">NFC</string>
-  <string name="intro_nfc_description">Элемент управления может быть привязан к NFC тегам долгим нажатием на этот элемент</string>
 </resources>
diff --git a/mobile/src/main/res/values-tl/strings.xml b/mobile/src/main/res/values-tl/strings.xml
index 8909a61fd3ed4997ea5ea24b223e6ff34cd6e1a5..7a38cb5442571d9417a9d4f27dfdd24da48ecbc5 100644
--- a/mobile/src/main/res/values-tl/strings.xml
+++ b/mobile/src/main/res/values-tl/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
   <string name="mainmenu_openhab_preferences">Mga Setting</string>
-  <string name="mainmenu_openhab_selectsitemap">Pumili ng default na sitemap</string>
   <string name="mainmenu_openhab_clearcache">Burahin ang mga imaheng naka-cache</string>
   <!-- App settings strings -->
   <string name="settings_connection_title">Koneksyon</string>
diff --git a/mobile/src/main/res/values-tr/strings.xml b/mobile/src/main/res/values-tr/strings.xml
index 73250aa70782c8d339b8533571cfbd964b363e0e..97c95e75db9fc9fad879f1fdeb084bd512f65f3e 100644
--- a/mobile/src/main/res/values-tr/strings.xml
+++ b/mobile/src/main/res/values-tr/strings.xml
@@ -9,7 +9,6 @@
   <!-- Main menu items -->
   <string name="mainmenu_openhab_sitemaps">Site Haritası</string>
   <string name="mainmenu_openhab_preferences">Ayarlar</string>
-  <string name="mainmenu_openhab_selectsitemap">Varsayılan site haritasını seç</string>
   <string name="mainmenu_openhab_clearcache">Resim önbelleğini temizle</string>
   <!-- App settings strings -->
   <string name="settings_openhab_url">Yerel sunucu URL\'si</string>
@@ -19,25 +18,17 @@
   <string name="settings_openhab_username">Kullanıcı Adı</string>
   <string name="settings_openhab_password">Şifre</string>
   <string name="settings_openhab_sslclientcert">SSL müşteri sertifikası</string>
-  <string name="settings_openhab_sslclientcert_howto">SSL müşteri sertifikası nasıl yapılır</string>
   <string name="settings_openhab_sslclientcert_howto_summary">SSL müşteri sertifikası yetkilendirilmesi kurulu hakkında ipuçları ve açıklamalar için buraya tıklayınız</string>
   <string name="settings_openhab_screentimeroff">Ekran Zamanlayıcısını devre dışı bırak</string>
   <string name="settings_openhab_screentimeroff_summary">openHAB çalışırken ekran kapatma zamanlayıcısını devre dışı bırakınız</string>
   <string name="settings_openhab_demomode">Deneme Modu</string>
   <string name="settings_openhab_demomode_summary">Deneme modunda çalıştır</string>
   <string name="settings_openhab_theme">Tema</string>
-  <string name="settings_openhab_sslcert">SSL sertifikasını yoksay</string>
-  <string name="settings_openhab_sslcert_summary">SSL handshake esnasında sertifika doğrulamasını yoksay</string>
-  <string name="settings_openhab_sslhost">SSL ana bilgisayar adını yoksay</string>
-  <string name="settings_openhab_sslhost_summary">SSL handshake esnasından ana bilgisayar adını yoksay</string>
   <string name="settings_openhab_fullscreen">Tam Ekran</string>
   <string name="settings_openhab_fullscreen_summary">Tam ekran modunda görüntüle</string>
   <string name="settings_openhab_icon_format">Simge formatı</string>
   <string name="settings_openhab_icon_format_png">Bitmap</string>
   <string name="settings_openhab_icon_format_svg">Vektör</string>
-  <string name="settings_clear_default_sitemap">Varsayılan site haritasını temizle</string>
-  <string name="settings_no_default_sitemap">Varsayılan her hangi bir site haritası seçilmedi</string>
-  <string name="settings_current_default_sitemap">Geçerli varsayılan site haritası: %1$s</string>
   <!-- App messages strings -->
   <string name="info_voice_input">openHAB Emrinizdedir!</string>
   <string name="info_voice_recognized_text">Tanımlanmış Emir: %1$s</string>
@@ -45,12 +36,9 @@
   <string name="info_conn_url">Yerel Sunucuya Bağlanıyor</string>
   <string name="info_conn_rem_url">Uzak URL\'ye Bağlanıyor</string>
   <!-- Error messages -->
-  <string name="error_empty_sitemap_list">openHAB boş site haritası listesini geri getirdi</string>
   <string name="error_network_not_available">Network müsait değil</string>
   <string name="error_connection_failed">Ana cihaza bağlantı başarısız oldu</string>
   <string name="error_unable_to_resolve_hostname">Ana cihaz adı çözülemiyor</string>
-  <string name="error_certificate_expired">SSL sertifikasının süresi doldu. Lütfen yeni bir sertifika edinin ya da SSL handshake esnasında sertifika doğrulamasını etkisiz hale getirin</string>
-  <string name="error_certificate_revoked">SSL sertifikası iptal edildi. Lütfen yeni bir sertifika edinin ya da SSL handshake esnasında sertifika doğrulamasını etkisiz hale getirin</string>
   <!-- Nginx specific codes, but since it is the recommended reverse proxy, we should check for them: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#nginx -->
   <string name="error_http_code_496">SSL müşteri sertifikası gereklidir (HTTP yanıt kodu 496)</string>
   <string name="error_http_code_511">Network kimlik doğrulaması gereklidir (HTTP yanıt kodu 511)</string>
@@ -69,8 +57,6 @@
   <string name="info_not_set">Ayarlı değil</string>
   <!-- Notification list strings -->
   <!-- Strings for MemorizingTrustManager activity -->
-  <string name="mtm_accept_cert">Bilinmeyen sertifika kabul edilsin mi?</string>
-  <string name="mtm_decision_always">Her zaman</string>
   <string name="mtm_decision_once">Bir kez</string>
   <string name="mtm_decision_abort">Çık</string>
   <string name="mtm_notification">Sertifika doğrulama</string>
@@ -94,20 +80,18 @@
   <!-- About -->
   <string name="about_title">Hakkında</string>
   <string name="about_license_title">Lisans</string>
-  <string name="settings_debug_messages_summary">Şifreler açık bir metinde görüntülenecek!</string>
-  <string name="settings_debug_messages_title">Hata ayıklama mesajlarını göster</string>
   <string name="error_couldnt_determine_openhab_url">openHAB URL\'si belirlenemedi</string>
   <string name="unknown">Bilinmeyen</string>
   <string name="error_network_type_unsupported">(%s) Network tipi desteklenmiyor</string>
   <string name="set">Ayarla</string>
   <string name="cancel">İptal Et</string>
+  <!-- Content description for images -->
+  <!-- Intro strings -->
   <string name="app_intro">Giriş</string>
   <string name="intro_welcome">openHAB\'a Hoş geldiniz</string>
   <string name="intro_whatis">Eviniz için sağlayıcı ve yeni teknolojiye geçişlerden etkilenmeyen açık kaynak otomasyon yazılımı</string>
   <string name="intro_themes">Temalar</string>
   <string name="intro_themes_description">Çeşitli temalar arasından seçim yap</string>
-  <!-- Content description for images -->
-  <!-- Intro strings -->
   <!-- Intro "SKIP" button -->
   <!-- Intro "DONE" button -->
 </resources>