diff --git a/OsmAnd-telegram/res/values-da/strings.xml b/OsmAnd-telegram/res/values-da/strings.xml
index 7a674e9c72..2db63733af 100644
--- a/OsmAnd-telegram/res/values-da/strings.xml
+++ b/OsmAnd-telegram/res/values-da/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources><string name="background_work_description">Skift indstillinger for batterioptimering, for stabil deling af placering</string>
 	<string name="background_work">Baggrundstilstand</string>
-	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Telegram, så det ikke pludselig slukker, når i baggrunden.</string>
+	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Telegram, så det ikke pludseligt bliver slukket, når det er i baggrunden.</string>
 	<string name="sharing_in_background">Deling i baggrunden</string>
 	<string name="go_to_settings">Gå til indstillinger</string>
 	<string name="shared_string_later">Senere</string>
@@ -26,16 +26,16 @@
 	<string name="by_group">Efter gruppe</string>
 	<string name="shared_string_sort">Sorter</string>
 	<string name="shared_string_sort_by">Sorter efter</string>
-	<string name="choose_osmand_desc">Vælg OsmAnd version, hvor kontakter skal vises på kortet.</string>
-	<string name="choose_osmand">Vælg en OsmAnd-version</string>
-	<string name="disable_all_sharing_desc">Deaktiverer deling af placering for alle de valgte samtaler (%1$d).</string>
+	<string name="choose_osmand_desc">Vælg den OsmAnd version, der skal vise kontakter på kortet.</string>
+	<string name="choose_osmand">Vælg OsmAnd-version der skal bruges</string>
+	<string name="disable_all_sharing_desc">Slukker for placeringsdeling for alle de valgte samtaler (%1$d).</string>
 	<string name="disable_all_sharing">Deaktiver al deling</string>
 	<string name="turn_off_all">Sluk alt</string>
 	<string name="shared_string_exit">Afslut</string>
 	<string name="time_ago">siden</string>
 	<string name="last_response">Sidste svar</string>
 	<string name="shared_string_group">Gruppe</string>
-	<string name="logout_no_internet_msg">Opret forbindelse til internettet for at logge ud af Telegram.</string>
+	<string name="logout_no_internet_msg">Opret forbindelse til Internettet for at logge ud af Telegram.</string>
 	<string name="shared_string_close">Luk</string>
 	<string name="disconnect_from_telegram_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session. "</string>
 	<string name="disconnect_from_telegram">Hvordan afbrydes OsmAnd placeringsdeling fra Telegram</string>
@@ -44,28 +44,28 @@
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">i %1$s</string>
 	<string name="osmand_connect_desc">Vælg den OsmAnd version, som OsmAnd Telegram bruger til vise placeringer på kortet.</string>
-	<string name="osmand_connect">OsmAnd forbindelse</string>
-	<string name="location_history_desc">Skjul de kontaktpersoner, der ikke har opdateret placering i et givet tidsrum.</string>
+	<string name="osmand_connect">Tilslut OsmAnd</string>
+	<string name="location_history_desc">Skjul kontakter, der ikke har bevæget sig i en given tid.</string>
 	<string name="location_history">Placeringshistorik</string>
-	<string name="stale_location_desc">Sidste gang en kontakt har sendt en placering.</string>
-	<string name="stale_location">Uaktuel placering</string>
+	<string name="stale_location_desc">Sidste gang en kontakt har bevæget sig.</string>
+	<string name="stale_location">Bevæger sig ikke</string>
 	<string name="send_my_location_desc">Angiv den mindste interval for deling af placering.</string>
 	<string name="send_my_location">Send placering</string>
-	<string name="gps_and_location">GPS og placering</string>
-	<string name="sharing_time">Delingstidsrum</string>
+	<string name="gps_and_location">Placering</string>
+	<string name="sharing_time">Delingstid</string>
 	<string name="expire_at">Udløber</string>
 	<string name="turn_off_location_sharing">Sluk for deling af placering</string>
 	<string name="open_osmand">Åbn OsmAnd</string>
 	<string name="shared_string_live">Live</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Registrering i Telegram</string>
-	<string name="get_telegram_account_first">Det er nødvendigt med en Telegram-konto for at bruge OsmAnd placeringsdeling.</string>
-	<string name="get_telegram_description_continue">Installer Telegram fra Google Play, og opret en konto.</string>
-	<string name="get_telegram_after_creating_account">Når konto er oprettet, kan programmet bruges.</string>
+	<string name="get_telegram_account_first">Det er nødvendigt med en Telegram-konto for at bruge placeringsdeling.</string>
+	<string name="get_telegram_description_continue">Installer Telegram og opret en konto.</string>
+	<string name="get_telegram_after_creating_account">Så kan programmet bruges.</string>
 	<string name="shared_string_all">Alle</string>
 	<string name="shared_string_off">Fra</string>
 	<string name="already_registered_in_telegram">Der er brug for en registreret Telegram-konto og telefonnummer</string>
-	<string name="do_not_have_telegram">Jeg har ikke Telegram konto</string>
+	<string name="do_not_have_telegram">Har ikke Telegram konto</string>
 	<string name="enter_phone_number">Indtast telefonnummer</string>
 	<string name="enter_authentication_code">Indtast autentificeringskode</string>
 	<string name="set_visible_time_for_all">Sæt synlige tid for alle</string>
@@ -76,11 +76,11 @@
 	<string name="shared_string_share">Del</string>
 	<string name="shared_string_back">Tilbage</string>
 	<string name="visible_time_for_all">Synlige tid for alle</string>
-	<string name="set_time_description">Sæt tidrummet hvor de valgte kontaktpersoner og grupper kan placering i realtid.</string>
+	<string name="set_time_description">Sæt tidrummet hvor de valgte kontakter og grupper kan se placering i realtid.</string>
 	<string name="set_time">Sæt tid</string>
-	<string name="location_sharing_description">Vælg de kontaktpersoner og grupper, som placeringen skal deles med.</string>
+	<string name="location_sharing_description">Vælg de kontakter og grupper, som placeringen skal deles med.</string>
 	<string name="my_location_search_hint">Søg: gruppe eller kontakt</string>
-	<string name="start_location_sharing">Start deling af placering</string>
+	<string name="start_location_sharing">Del placering</string>
 	<string name="show_on_map">Vis på kort</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Telefonnummer</string>
@@ -90,7 +90,7 @@
 	<string name="authentication_code">Autentificeringkode</string>
 	<string name="authentication_code_descr">Telegram har sendt en kode. Den vil blive brugt af OsmAnd som konto log ind.</string>
 	<string name="enter_password">Indtast adgangskode</string>
-	<string name="password_descr">Indtast adgangskode til Telegram-konto</string>
+	<string name="password_descr">Telegram adgangskode</string>
 	<string name="shared_string_login">Log ind</string>
 	<string name="shared_string_logout">Log ud</string>
 	<string name="not_logged_in">Ikke logget ind</string>
@@ -149,19 +149,24 @@
 	<string name="successfully_sent_and_updated">Sendt korrekt og opdateret</string>
 	<string name="not_possible_to_send_to_telegram_chats">Ikke muligt at sende til Telegram samtaler:</string>
 	<string name="waiting_for_response_from_telegram">Venter på svar fra Telegram</string>
-	<string name="sending_location_messages">Sender placeringsmeddelelser</string>
-	<string name="initializing">Initialiserer</string>
-	<string name="searching_for_gps">Søger efter GPS</string>
-	<string name="connecting_to_the_internet">Forbinder til internettet</string>
-	<string name="enter_another_device_name">Indtast et andet navn, der er allerede en enhed med det samme navn</string>
+	<string name="sending_location_messages">Sender placering</string>
+	<string name="initializing">Starter</string>
+	<string name="searching_for_gps">Positionering…</string>
+	<string name="connecting_to_the_internet">Forbinder til Internettet</string>
+	<string name="enter_another_device_name">Vælg et navn der ikke allerede er brugt</string>
 	<string name="device_added_successfully">%1$s tilføjet.</string>
 	<string name="shared_string_add">Tilføj</string>
-	<string name="error_adding_new_device">Fejl ved tilføjelse af ny enhed</string>
-	<string name="enter_device_name_description">Indtast et navn til den nye enhed. Max længde 200 tegn.</string>
+	<string name="error_adding_new_device">Kunne ikke tilføje ny enhed</string>
+	<string name="enter_device_name_description">Indtast et navn til den nye enhed. Max 200 tegn.</string>
 	<string name="device_name_is_too_long">Enhedsnavn er for langt</string>
 	<string name="device_name_cannot_be_empty">Enhedsnavn må ikke være tomt</string>
 	<string name="device_name">Enhedsnavn</string>
 	<string name="shared_string_hide">Skjul</string>
 	<string name="share_location_as_description_second_line">Opret og få vist enhedens-id i Telegram-klienten ved hjælp af %1$s chat-bot. %2$s</string>
 	<string name="share_location_as_description">Hvis der skal tilsluttes flere enheder til en Telegram-konto, er det nødvendigt til at bruge forskellige enheder til at dele placeringen.</string>
+	<string name="shared_string_save">Gem</string>
+	<string name="stop_sharing_all">Deling er aktiv (sluk)</string>
+	<string name="initialization">Starter</string>
+	<string name="logging_out">Logger ud</string>
+	<string name="closing">Lukker</string>
 	</resources>
diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml
index 9c34b7ee65..de86676c84 100644
--- a/OsmAnd-telegram/res/values-de/strings.xml
+++ b/OsmAnd-telegram/res/values-de/strings.xml
@@ -34,19 +34,19 @@
 	<string name="connected_account">Verbundenes Konto</string>
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">"in %1$s "</string>
-	<string name="osmand_connect_desc">Wählen Sie die OsmAnd-Version, die OsmAnd Telegram verwendet, um Positionen auf der Karte anzuzeigen.</string>
+	<string name="osmand_connect_desc">Wählen Sie die OsmAnd-Version, die OsmAnd Telegram verwendet, um Positionen anzuzeigen.</string>
 	<string name="osmand_connect">OsmAnd verbinden</string>
-	<string name="location_history_desc">Blenden Sie die Kontakte aus, die ihren Standort in einer vorgegebenen Zeitspanne nicht aktualisiert haben.</string>
+	<string name="location_history_desc">Blendet Kontakte aus, die sich eine bestimmte Zeit lang nicht bewegt haben.</string>
 	<string name="location_history">Standortverlauf</string>
-	<string name="stale_location_desc">Das letzte Mal, dass ein Kontakt seinen Standort gesendet hat.</string>
+	<string name="stale_location_desc">Das letzte Mal, dass sich ein Kontakt bewegt hat.</string>
 	<string name="send_my_location">Meinen Standort senden</string>
-	<string name="gps_and_location">GPS &amp; Standort</string>
+	<string name="gps_and_location">Position</string>
 	<string name="open_osmand">OsmAnd öffnen</string>
 	<string name="shared_string_live">"Live "</string>
 	<string name="get_telegram_title">Registrierung in Telegram</string>
-	<string name="get_telegram_account_first">Sie benötigen ein Telegram-Konto, um die OsmAnd Standortfreigabe nutzen zu können.</string>
-	<string name="get_telegram_description_continue">Bitte installieren Sie Telegram von Google Play und registrieren Sie dazu ein Konto.</string>
-	<string name="get_telegram_after_creating_account">Nach der Erstellung des Kontos können Sie diese App nutzen.</string>
+	<string name="get_telegram_account_first">Sie benötigen ein Telegram-Konto, um die Standortfreigabe nutzen zu können.</string>
+	<string name="get_telegram_description_continue">Bitte installieren Sie Telegram und richten Sie ein Konto ein.</string>
+	<string name="get_telegram_after_creating_account">Dann können Sie diese App nutzen.</string>
 	<string name="shared_string_all">Alle</string>
 	<string name="shared_string_off">Aus</string>
 	<string name="already_registered_in_telegram">Sie benötigen ein registriertes Telegram-Konto und eine Telefonnummer</string>
@@ -65,7 +65,7 @@
 	<string name="show_on_map">Auf Karte anzeigen</string>
 	<string name="app_name">"OsmAnd Telegram "</string>
 	<string name="phone_number_title">Telefonnummer</string>
-	<string name="phone_number_descr">Telefonnummer im internationalen Format</string>
+	<string name="phone_number_descr">Telefonnummer in internationalem Format</string>
 	<string name="shared_string_password">Passwort</string>
 	<string name="enter_code">Code eingeben</string>
 	<string name="authentication_code">Authentifizierungscode</string>
@@ -78,7 +78,7 @@
 	<string name="shared_string_cancel">Abbrechen</string>
 	<string name="shared_string_settings">Einstellungen</string>
 	<string name="no_location_permission">Der App fehlt die Berechtigung, auf Standortdaten zuzugreifen.</string>
-	<string name="gps_not_available">Bitte aktivieren Sie GPS in den Einstellungen</string>
+	<string name="gps_not_available">Bitte schalten Sie \"Standort\" in den Systemeinstellungen ein</string>
 	<string name="osmand_service">Hintergrundmodus</string>
 	<string name="osmand_service_descr">OsmAnd Telegram läuft im Hintergrund bei ausgeschaltetem Bildschirm.</string>
 	<string name="shared_string_distance">Distanz</string>
@@ -123,12 +123,12 @@
 <string name="background_work">Hintergrundbetrieb</string>
 	<string name="successfully_sent_and_updated">Erfolgreich gesendet und aktualisiert</string>
 	<string name="waiting_for_response_from_telegram">Warten auf Antwort von Telegram</string>
-	<string name="sending_location_messages">Versand von Standortmitteilungen</string>
-	<string name="initializing">Initialisierung</string>
-	<string name="searching_for_gps">Suche nach GPS-Signal</string>
+	<string name="sending_location_messages">Sende Standort</string>
+	<string name="initializing">Startet</string>
+	<string name="searching_for_gps">Positioniere..…</string>
 	<string name="connecting_to_the_internet">Verbindung zum Internet</string>
-	<string name="background_work_description">Akkuoptimierungseinstellungen für eine dauerhafte Standortfreigabe ändern</string>
-	<string name="password_descr">Bitte Passwort für Ihr Telegram-Konto eingeben</string>
+	<string name="background_work_description">Akkuoptimierungseinstellungen, um die Standortfreigabe zu stabilisieren.</string>
+	<string name="password_descr">Telegram-Passwort</string>
 	<string name="nm">kn</string>
 	<string name="nm_h">kn/h</string>
 	<string name="last_updated_location">Zuletzt aktualisierter Ort:</string>
@@ -137,31 +137,40 @@
 	<string name="logout_from_osmand_telegram_descr">Sind Sie sicher, dass Sie sich von OsmAnd Telegram abmelden möchten, so dass Sie den Standort nicht teilen oder den Standort anderer sehen können\?</string>
 	<string name="disable_all_sharing_desc">Schaltet die Standortfreigabe für alle ausgewählten Chats aus (%1$d).</string>
 	<string name="disable_all_sharing">Alle Freigaben deaktivieren</string>
-	<string name="disconnect_from_telegram_desc">Um den Zugriff auf die Standortfreigabe zu widerrufen, öffnen Sie Telegram, gehen zu Einstellungen - Datenschutz und Sicherheit - Sitzungen und beenden die OsmAnd Telegram-Sitzung.</string>
+	<string name="disconnect_from_telegram_desc">Um den Zugriff auf die Standortfreigabe zu widerrufen, öffnen Sie Telegram, gehen zu Einstellungen → Datenschutz und Sicherheit → Sitzungen und beenden die OsmAnd Telegram-Sitzung.</string>
 	<string name="disconnect_from_telegram">So deaktivieren Sie OsmAnd Standortfreigabe von Telegram aus</string>
 	<string name="logout_help_desc">So deaktivieren Sie OsmAnd Standortfreigabe von Telegram aus</string>
-	<string name="stale_location">Veralteter Standort</string>
+	<string name="stale_location">Keine Bewegung</string>
 	<string name="send_my_location_desc">Legen Sie das Mindestintervall für die Standortfreigabe fest.</string>
 	<string name="sharing_time">Freigabezeit</string>
-	<string name="expire_at">Verfällt um</string>
+	<string name="expire_at">Verfällt</string>
 	<string name="turn_off_location_sharing">Standortfreigabe ausschalten</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="set_visible_time_for_all">Für alle sichtbare Zeit einstellen</string>
 	<string name="set_time_description">Zeit einstellen, zu der Ihren Kontakten und Gruppen Ihr Standorts in Echtzeit angezeigt wird.</string>
-	<string name="location_sharing_description">Kontakte und Gruppen wählen, für die Sie Ihren Standort freigeben möchten.</string>
-	<string name="start_location_sharing">Standortfreigabe starten</string>
-	<string name="location_service_no_gps_available">Wählen Sie einen der Standortprovider aus, um Ihren Standort freizugeben.</string>
+	<string name="location_sharing_description">Kontakte und Gruppen wählen, denen Sie Ihren Standort freigeben möchten.</string>
+	<string name="start_location_sharing">Standort freigeben</string>
+	<string name="location_service_no_gps_available">Wählen Sie einen der Standortanbieter aus, um Ihren Standort freizugeben.</string>
 	<string name="sharing_location">Standort teilen</string>
 	<string name="welcome_descr"><b>OsmAnd Standortfreigabe</b> ermöglicht es Ihnen, Ihren Standort zu teilen und den anderer in OsmAnd zu sehen.<br/><br/>Die App verwendet die API von Telegram und Sie benötigen ein Telegram-Konto.</string>
-	<string name="enter_another_device_name">Geben Sie einen anderen Namen ein, Sie haben bereits ein Gerät mit dem gleichen Namen</string>
-	<string name="device_added_successfully">%1$s erfolgreich hinzugefügt.</string>
+	<string name="enter_another_device_name">Wählen Sie einen Namen, den Sie noch nicht benutzt haben</string>
+	<string name="device_added_successfully">%1$s hinzugefügt.</string>
 	<string name="shared_string_add">Hinzufügen</string>
-	<string name="error_adding_new_device">Fehler beim Hinzufügen eines neuen Geräts</string>
-	<string name="enter_device_name_description">Geben Sie einen Namen für Ihr neues Gerät ein. Maximale Länge 200 Symbole.</string>
+	<string name="error_adding_new_device">Neues Gerät konnte nicht hinzugefügt werden</string>
+	<string name="enter_device_name_description">Benennen Sie Ihr neues Gerät mit max. 200 Symbolen.</string>
 	<string name="device_name_is_too_long">Gerätename ist zu lang</string>
 	<string name="device_name_cannot_be_empty">Der Gerätename darf nicht leer sein</string>
 	<string name="device_name">Gerätename</string>
 	<string name="shared_string_hide">Verbergen</string>
 	<string name="share_location_as_description_second_line">Sie können die Geräte-ID im Telegram-Client mit dem Chat-Bot %1$s erstellen und anzeigen. %2$s</string>
 	<string name="share_location_as_description">Wenn Sie mehrere Geräte mit einem Telegram-Konto verbinden möchten, müssen Sie ein anderes Gerät verwenden, um Ihren Standort zu teilen.</string>
-	</resources>
+	<string name="shared_string_save">Speichern</string>
+	<string name="stop_sharing_all">Die Freigabe ist eingeschaltet (ausschalten)</string>
+	<string name="initialization">Startet</string>
+	<string name="logging_out">Abmeldevorgang</string>
+	<string name="closing">Schliesst</string>
+	<string name="gps_network_not_enabled">\"Standort\" einschalten\?</string>
+	<string name="live_now">Jetzt live</string>
+
+
+</resources>
diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml
index 99116a8229..61dcc7ae26 100644
--- a/OsmAnd-telegram/res/values-nb/strings.xml
+++ b/OsmAnd-telegram/res/values-nb/strings.xml
@@ -164,4 +164,13 @@
 	<string name="shared_string_hide">Skjul</string>
 	<string name="share_location_as_description_second_line">Du kan opprette og vise enhets-ID i Telegram-klienten ved bruk av %1$s-sludrebot-en. %2$s</string>
 	<string name="share_location_as_description">Hvis du vil koble flere enheter til én Telegram-konto, må du bruke en annen enhet til å dele din plassering.</string>
-	</resources>
+	<string name="shared_string_save">Lagre</string>
+	<string name="stop_sharing_all">Deling er på (skru av)</string>
+	<string name="initialization">Starter</string>
+	<string name="logging_out">Logger ut</string>
+	<string name="closing">Lukker</string>
+	<string name="gps_network_not_enabled">Skru på \"Plassering\"\?</string>
+	<string name="live_now">Sanntidsdeler nå</string>
+
+
+</resources>
diff --git a/OsmAnd-telegram/res/values-sl/strings.xml b/OsmAnd-telegram/res/values-sl/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd-telegram/res/values-sl/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index f32609dcbb..85675fd3d2 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -3028,7 +3028,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="ask_for_location_permission">Per continuar cal que doneu a OsmAnd accés a la ubicació.</string>
     <string name="rendering_value_black_name">Negre</string>
     <string name="search_street">Cerca un carrer</string>
-    <string name="start_search_from_city">Comença la cerca des de la ciutat</string>
+    <string name="start_search_from_city">Seleccioneu primer la ciutat</string>
     <string name="shared_string_restore">Restaura</string>
     <string name="keep_passed_markers_descr">Els marcadors afegits a un grup de Preferits i les fites GPX ja assolides romandran al mapa. Si el grup no estigués activat, els marcadors no apareixerien al mapa.</string>
     <string name="keep_passed_markers">Manté al mapa les fites assolides</string>
@@ -3036,4 +3036,18 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Voleu esborrar el marcador de mapa \'%s\'\?</string>
     <string name="edit_map_marker">Edita el marcador de mapa</string>
     <string name="third_party_application">Aplicació de tercers</string>
+    <string name="osm_live_plan_pricing">Pla i preu</string>
+    <string name="osm_live_payment_monthly_title">Pagament mensual</string>
+    <string name="osm_live_payment_3_months_title">Pagament trimestral</string>
+    <string name="osm_live_payment_annual_title">Pagament anual</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
+    <string name="osm_live_payment_discount_descr">Desa %1$s!</string>
+	<string name="osm_live_payment_current_subscription">La vostra subscripció actual</string>
+    <string name="osm_live_payment_renews_monthly">Renovació mensual</string>
+    <string name="osm_live_payment_renews_quarterly">Renovació trimestral</string>
+    <string name="osm_live_payment_renews_annually">Renovació anual</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Seleccioneu el període de pagament que us convingui:</string>
+    <string name="osm_live_payment_contribute_descr">Una part dels ingressos és pels col·laboradors d\'OpenStreetMap.</string>
     </resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 31a5b318e2..c1e2e8737c 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -3967,4 +3967,27 @@
 <string name="poi_atm">Pengeautomat</string>
 	<string name="poi_shoe_repair">Skoreparation</string>
 
+<string name="poi_bulk_purchase">Storkøb</string>
+	<string name="poi_substation_type">Type</string>
+
+<string name="poi_bulk_purchase_yes">Storkøb: ja</string>
+	<string name="poi_bulk_purchase_only">Storkøb: kun</string>
+
+	<string name="poi_pipeline_substation">Rørledningsstation</string>
+	<string name="poi_substation_transmission">Transmission</string>
+	<string name="poi_substation_distribution">Distribution</string>
+	<string name="poi_substation_minor_distribution">Mindre distribution</string>
+	<string name="poi_substation_industrial">Industriel</string>
+	<string name="poi_substation_transition">Overgang</string>
+	<string name="poi_substation_traction">Trækkraft</string>
+	<string name="poi_substation_converter">Converter</string>
+	<string name="poi_substation_compensation">Kompensation</string>
+
+	<string name="poi_substation_compression">Komprimering:</string>
+	<string name="poi_substation_measurement">Måling</string>
+	<string name="poi_substation_valve">Ventil</string>
+	<string name="poi_substation_valve_group">Ventilgruppe</string>
+	<string name="poi_substation_inspection_gauge">Inspektionsmåler</string>
+	<string name="poi_substation_field_gathering">Feltsamling</string>
+
 </resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 64dcf46d14..02f439f3b3 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -3195,13 +3195,19 @@ Repræsenterer område: %1$s x %2$s</string>
 \nGiv tilbagemelding</string>
     <string name="test_voice_desrc">Tryk på en knap og lyt til den tilsvarende talemeddelelse for at identificere manglende eller fejlagtige meddelelser.</string>
 <string name="commiting_way">Indsendelsesmåde…</string>
-    <string name="release_3_2_pre">• Løst nedbrud ved opstart, som fandt sted med ikke-latinske kort 
+    <string name="release_3_2_pre">• Løst nedbrud ved start, der opstod på nogle enheder
+\n
+\n • Ny Markør funktion: visning af de mærker, der allerede er nået
+\n
+\n • Søgehistorikken viser nu de kategorier, der er søgt efter tidligere
+\n
+\n • Løst nedbrud ved opstart, der opstod med ikke-latinske kort 
 \n 
 \n  • Forbedret renderingshastighed på Android 8.0 enheder 
 \n 
-\n  • Understøtter redigering af polygonobjekter (ikke-facilitet)
-\n
-\n  • Afstandsmåling: tilføjet knap til afstandsmåling i handlinger i kontekstmenuen
+\n  • Understøtter redigering af polygonobjekter (ikke-facilitet) 
+\n 
+\n  • Afstandsmåling: tilføjet knap til afstandsmåling i handlinger i kontekstmenuen 
 \n</string>
     <string name="ask_for_location_permission">Giv OsmAnd tilladelse til placering for at fortsætte.</string>
     <string name="rendering_value_black_name">Sort</string>
@@ -3210,8 +3216,22 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="edit_map_marker">Rediger kortmarkør</string>
     <string name="third_party_application">Tredjepartsprogram</string>
     <string name="search_street">Søg efter gade</string>
-    <string name="start_search_from_city">Start søgning fra byen</string>
+    <string name="start_search_from_city">Vælg en by først</string>
     <string name="shared_string_restore">Gendan</string>
     <string name="keep_passed_markers_descr">Markører tilføjet som en gruppe af favoritter eller GPX rutepunkter markeret passeret vil forblive på kortet. Hvis gruppen ikke er aktiv, vil mærkerne forsvinde fra kortet.</string>
     <string name="keep_passed_markers">Behold passerede markører på kortet</string>
+    <string name="osm_live_plan_pricing">Plan &amp; Priser</string>
+    <string name="osm_live_payment_monthly_title">Betal månedligt</string>
+    <string name="osm_live_payment_3_months_title">Betal én gang i 3 måneder</string>
+    <string name="osm_live_payment_annual_title">Betal en gang om året</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / måned</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / måned</string>
+    <string name="osm_live_payment_discount_descr">Spar %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Nuværende abonnement</string>
+    <string name="osm_live_payment_renews_monthly">Forny månedlig</string>
+    <string name="osm_live_payment_renews_quarterly">Forny kvartalsvis</string>
+    <string name="osm_live_payment_renews_annually">Forny hvert år</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Vælg en passende betalingsperiode:</string>
+    <string name="osm_live_payment_contribute_descr">En del af indtægterne går til OpenStreetMap bidragydere.</string>
     </resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 8b8bdeba49..3ae42ea47a 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -3885,4 +3885,25 @@
 <string name="poi_atm">Geldautomat</string>
 	<string name="poi_shoe_repair">Schuhreparatur</string>
 
+<string name="poi_bulk_purchase">Großeinkauf</string>
+	<string name="poi_substation_type">Typ</string>
+
+<string name="poi_bulk_purchase_yes">Großbestellung: ja</string>
+	<string name="poi_bulk_purchase_only">Großbestellung: nur</string>
+
+	<string name="poi_substation_transmission">Übertragung</string>
+	<string name="poi_substation_distribution">Vertrieb</string>
+	<string name="poi_substation_minor_distribution">Geringe Verteilung</string>
+	<string name="poi_substation_industrial">Industriell</string>
+	<string name="poi_substation_transition">Übergang</string>
+	<string name="poi_substation_traction">Bodenhaftung</string>
+	<string name="poi_substation_converter">Umrichter</string>
+	<string name="poi_substation_compensation">Kompensation</string>
+
+	<string name="poi_substation_compression">Kompression</string>
+	<string name="poi_substation_measurement">Messung</string>
+	<string name="poi_substation_valve">Ventil</string>
+	<string name="poi_substation_valve_group">Ventilgruppe</string>
+	<string name="poi_substation_field_gathering">Feldsammlung</string>
+
 </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index dfdea9032c..c5f52ee1de 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -3118,4 +3118,18 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Kartenmarkierung \'%s\' löschen\?</string>
     <string name="edit_map_marker">Kartenmarkierung bearbeiten</string>
     <string name="third_party_application">Drittanbieter-App</string>
+    <string name="osm_live_plan_pricing">Plan &amp; Preisgestaltung</string>
+    <string name="osm_live_payment_monthly_title">Monatlich bezahlen</string>
+    <string name="osm_live_payment_3_months_title">Alle 3 Monate bezahlen</string>
+    <string name="osm_live_payment_annual_title">Einmal im Jahr bezahlen</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / Monat</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / Monat</string>
+    <string name="osm_live_payment_discount_descr">Sparen Sie %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ihr aktuelles Abonnement</string>
+    <string name="osm_live_payment_renews_monthly">Verlängert monatlich</string>
+    <string name="osm_live_payment_renews_quarterly">Verlängert vierteljährlich</string>
+    <string name="osm_live_payment_renews_annually">Verlängert jährlich</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Wählen Sie den für Sie passenden Zahlungszeitraum aus:</string>
+    <string name="osm_live_payment_contribute_descr">Ein Teil der Einnahmen geht an OpenStreetMap-Mitwirkende.</string>
     </resources>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index a02f21a8c8..10277c7c0b 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -687,7 +687,7 @@
 	<string name="poi_embassy_type">نوع سفارت</string>
 	<string name="poi_city_capital">پایتخت</string>
 	<string name="poi_healthcare_alternative_types">نوع درمانگاه تخصصی</string>
-	<string name="poi_free_flying_characteristics">مشخصات پرواز آزاد</string>
+	<string name="poi_free_flying_characteristics">مشخصات</string>
 	<string name="poi_archaeological_site_type">مرکز باستان شناسی</string>
 	<string name="poi_religion_type">دین</string>
 	<string name="poi_denomination">مذهب</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 295a6dd226..e2244435a9 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -3213,11 +3213,26 @@
     <string name="ask_for_location_permission">برای ادامه، لطفاً به OsmAnd اجازهٔ دسترسی به موقعیت مکانی را بدهید.</string>
     <string name="rendering_value_black_name">سیاه</string>
     <string name="search_street">جست‌وجوی خیابان</string>
-    <string name="start_search_from_city">آغاز جست‌وجو از شهر</string>
+    <string name="start_search_from_city">ابتدا شهر را انتخاب کنید</string>
     <string name="shared_string_restore">بازیابی</string>
     <string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از برگزیده‌ها یا نقاط بین‌راهی GPX وارد شده‌اند و از آن‌ها عبور کرده‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
     <string name="keep_passed_markers">نشانه‌های پشت سر گذاشته را روی نقشه نگه دار</string>
     <string name="markers_remove_dialog_msg">نشانهٔ %s حذف شود؟</string>
     <string name="edit_map_marker">ویرایش نشانه</string>
     <string name="third_party_application">برنامهٔ شخص ثالث</string>
+    <string name="osm_live_plan_pricing">طرح و قیمت</string>
+    <string name="osm_live_payment_monthly_title">پرداخت ماهانه</string>
+    <string name="osm_live_payment_3_months_title">پرداخت سه‌ماهه</string>
+    <string name="osm_live_payment_annual_title">پرداخت سالانه</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s در ماه</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s در ماه</string>
+    <string name="osm_live_payment_discount_descr">%1$s صرفه‌جویی کنید!</string>
+	<string name="osm_live_payment_current_subscription">اشتراک کنونی شما</string>
+    <string name="osm_live_payment_renews_monthly">ماهانه تمدید می‌شود</string>
+    <string name="osm_live_payment_renews_quarterly">سه‌ماهه تمدید می‌شود</string>
+    <string name="osm_live_payment_renews_annually">سالانه تمدید می‌شود</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">دورهٔ پرداخت مناسب خود را برگزینید:</string>
+    <string name="osm_live_payment_contribute_descr">بخشی از درآمد به مشارکت‌کنندگان نقشهٔ شهری باز اهدا می‌شود.</string>
+    <string name="more_transport_on_stop_hint">در این ایستگاه حمل‌ونقل بیشتری وجود دارد.</string>
     </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index abc1a7c135..c809fe0d60 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3189,11 +3189,21 @@ représentant la zone : %1$s x %2$s</string>
     <string name="rendering_value_black_name">Noir</string>
     <string name="more_transport_on_stop_hint">Il y a d\'autres moyens de transport à cet arrêt.</string>
     <string name="search_street">Rechercher une rue</string>
-    <string name="start_search_from_city">Recherche par nom de ville</string>
+    <string name="start_search_from_city">Tapez un nom de ville</string>
     <string name="shared_string_restore">Restaurer</string>
     <string name="keep_passed_markers_descr">Les marques visitées resteront affichées sur la carte, que les marques appartiennent à un groupe de favoris ou qu\'il s\'agisse de points de passage GPX. Ces marques ne disparaîtront que lorsque le groupe ou la trace sera désactivé.</string>
     <string name="keep_passed_markers">Afficher sur la carte les marques visitées</string>
     <string name="markers_remove_dialog_msg">Supprimer la marque \'%s\' \?</string>
     <string name="edit_map_marker">Modifier la marque</string>
     <string name="third_party_application">Application tierce</string>
+    <string name="osm_live_payment_monthly_title">Payer chaque mois</string>
+    <string name="osm_live_payment_3_months_title">Payer tous les 3 mois</string>
+    <string name="osm_live_payment_annual_title">Payer chaque année</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mois</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mois</string>
+    <string name="osm_live_payment_discount_descr">Économisez %1$s !</string>
+	<string name="osm_live_payment_current_subscription">Votre abonnement actuel</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Sélectionnez la fréquence de règlement qui vous convient :</string>
+    <string name="osm_live_payment_contribute_descr">Une partie des revenus est reversée aux contributeurs OpenStreetMap.</string>
     </resources>
diff --git a/OsmAnd/res/values-he/phrases.xml b/OsmAnd/res/values-he/phrases.xml
index 52e09fb106..82a1141752 100644
--- a/OsmAnd/res/values-he/phrases.xml
+++ b/OsmAnd/res/values-he/phrases.xml
@@ -2270,4 +2270,5 @@
 	<string name="poi_pump_status_broken">מצב המשאבה: פגומה</string>
 	<string name="poi_pump_status_locked">מצב המשאבה: נעולה</string>
 
+	<string name="poi_dispensing_yes">כן</string>
 	</resources>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 577f5fd74f..03fc954d94 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -3110,4 +3110,16 @@
     <string name="markers_remove_dialog_msg">למחוק את סמן המפה ‚%s’\?</string>
     <string name="edit_map_marker">עריכת סמן מפה</string>
     <string name="third_party_application">יישום צד שלישי</string>
+    <string name="osm_live_plan_pricing">תכנית ומחיר</string>
+    <string name="osm_live_payment_monthly_title">תשלום חודשי</string>
+    <string name="osm_live_payment_3_months_title">תשלום אחת ל־3 חודשים</string>
+    <string name="osm_live_payment_annual_title">תשלום אחת לשנה</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s לחודש</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s לחודש</string>
+    <string name="osm_live_payment_discount_descr">חיסכון של %1$s!</string>
+	<string name="osm_live_payment_current_subscription">המינוי הנוכחי שלך</string>
+    <string name="osm_live_payment_renews_monthly">מתחדש חודשית</string>
+    <string name="osm_live_payment_renews_quarterly">מתחדש רבעונית</string>
+    <string name="osm_live_payment_renews_annually">מתחדש שנתית</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
     </resources>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 84cfc5dffe..6c199f624a 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -3868,4 +3868,10 @@
 <string name="poi_atm">Hraðbanki</string>
 	<string name="poi_shoe_repair">Skóviðgerðir</string>
 
-</resources>
+<string name="poi_bulk_purchase">Magnkaup</string>
+	<string name="poi_substation_type">Tegund</string>
+
+<string name="poi_bulk_purchase_yes">Magnkaup: já</string>
+	<string name="poi_bulk_purchase_only">Magnkaup: einungis</string>
+
+	</resources>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 81fd2cb004..948b3e1999 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -2982,7 +2982,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
 \n</string>
     <string name="rendering_value_black_name">Svart</string>
     <string name="search_street">Leita að götu</string>
-    <string name="start_search_from_city">Hefja leit út frá borg</string>
+    <string name="start_search_from_city">Veldu fyrst borgina</string>
     <string name="shared_string_restore">Endurheimta</string>
     <string name="keep_passed_markers_descr">Kortamerki sem bætt er inn sem hópi eftirlæta eða sem GPX-ferli og sem þegar hefur verið farið um, verða áfram á kortinu. Ef hópurinn er ekki virkur, munu kortamerkin hverfa.</string>
     <string name="keep_passed_markers">Halda merkjum sem þegar hefur verið farið um á kortinu</string>
@@ -2990,4 +2990,18 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Eyða kortamerkinu \'%s\'\?</string>
     <string name="edit_map_marker">Breyta kortamerki</string>
     <string name="third_party_application">Utanaðkomandi forrit</string>
+    <string name="osm_live_plan_pricing">Áskrift og verð</string>
+    <string name="osm_live_payment_monthly_title">Greiða mánaðarlega</string>
+    <string name="osm_live_payment_3_months_title">Greiða á þriggja mánaða fresti</string>
+    <string name="osm_live_payment_annual_title">Greiða árlega</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mánuði</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mánuði</string>
+    <string name="osm_live_payment_discount_descr">Sparaðu %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Núverandi áskrift þín</string>
+    <string name="osm_live_payment_renews_monthly">Endurnýjast mánaðarlega</string>
+    <string name="osm_live_payment_renews_quarterly">Endurnýjast ársfjórðungslega</string>
+    <string name="osm_live_payment_renews_annually">Endurnýjast árlega</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Veldu greiðslumátann sem hentar þér best:</string>
+    <string name="osm_live_payment_contribute_descr">Hluti innkomunnar fer til þeirra sem leggja OpenStreetMap lið.</string>
     </resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index f1ad5adc0f..467b901711 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -98,7 +98,7 @@
 <string name="shared_string_clear">Limpar</string>
 <string name="shared_string_clear_all">Limpar tudo</string>
 <string name="shared_string_save">Salvar</string>
-<string name="shared_string_save_as_gpx">Salvar como trilha GPX</string>
+<string name="shared_string_save_as_gpx">Salvar como novo arquivo GPX</string>
 <string name="shared_string_rename">Renomear</string>
 <string name="shared_string_delete">Apagar</string>
 <string name="shared_string_delete_all">Apagar tudo</string>
@@ -319,10 +319,10 @@
 <string name="save_track_to_gpx_globally">Registrar trilha em arquivo GPX</string>
 <string name="save_track_to_gpx_globally_headline">Registro de trilha sob demanda</string>
 <string name="save_track_to_gpx_globally_descr">Posição geral de registro para um arquivo GPX pode ser ativada ou desativada usando o widget de registro de GPX na tela do mapa</string>
-<string name="save_current_track_descr">Salvar a trilha atual no SD agora</string>
-<string name="save_current_track">Salvar a trilha GPX atual</string>
+<string name="save_current_track_descr">Salvar a trilha atual como arquivo GPX agora.</string>
+<string name="save_current_track">Salvar a trilha atual</string>
 <string name="save_track_to_gpx">Auto-registrar a trilha durante a navegação</string>
-<string name="save_track_to_gpx_descrp">trilha serão salvas no diretório de trilhas durante a navegação</string>
+<string name="save_track_to_gpx_descrp">A trilha GPX será salva automaticamente no diretório de trilhas durante a navegação.</string>
 <string name="save_track_interval_globally">Intervalo de registro</string>
 <string name="save_track_interval">Intervalo de registro durante a navegação</string>
 <string name="save_track_interval_descr">Escolher o intervalo de registro para a gravação de trilha durante a navegação.</string>
@@ -2182,7 +2182,7 @@ Pôr do Sol: %2$s</string>
 <string name="quick_action_resume_pause_navigation_descr">Toque neste botão para pausar ou retomar a navegação.</string>
 <string name="quick_action_start_stop_navigation">Iniciar/parar navegação</string>
 <string name="quick_action_start_stop_navigation_descr">Toque neste botão para iniciar ou parar a navegação.</string>
-    <string name="store_tracks_in_monthly_directories">Salvar trilhas gravadas em pastas mensais</string>
+    <string name="store_tracks_in_monthly_directories">Salvar trilhas em pastas mensais</string>
     <string name="store_tracks_in_monthly_directories_descrp">Salvar trilhas gravadas em subpastas por mês (ex.: 2018-01).</string>
     <string name="shared_string_reset">Redefinir</string>
     <string name="shared_string_reload">Recarregar</string>
@@ -2952,7 +2952,7 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_restore">Restaurar</string>
     <string name="rendering_value_black_name">Preto</string>
     <string name="more_transport_on_stop_hint">Esta parada tem outros meios de transporte.</string>
-    <string name="keep_passed_markers">Manter os marcadores visitados no mapa\t</string>
+    <string name="keep_passed_markers">Manter os marcadores visitados no mapa</string>
     <string name="keep_passed_markers_descr">Marcadores adicionados como grupo de Favoritos ou pontos de passagem GPX marcados como Visitado permanecerão no mapa. Se o grupo não estiver ativo, os marcadores desaparecerão do mapa.</string>
     <string name="release_3_2_pre">• Corrigida a falha na inicialização que ocorria em alguns dispositivos.
 \n