Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd-telegram/res/values-da/strings.xml

@@ -8,21 +8,14 @@
 	<string name="not_sent_yet">Ikke sendt endnu</string>
 	<string name="not_found_yet">Ikke fundet endnu</string>
 	<string name="re_send_location">Send placering igen</string>
-	<string name="last_sent_location">Sidst sendte placering</string>
 	<string name="last_available_location">Sidste tilgængelige placering</string>
 	<string name="sharing_status">Delingsstatus</string>
 	<string name="sharing_enabled">Deling: aktiveret</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Ingen GPS-forbindelse</string>
-	<string name="sharing_success">Sendt korrekt og opdateret</string>
-	<string name="not_possible_to_send_to_chats">Ikke muligt at sende til samtaler:</string>
 	<string name="no_internet_connection">Ingen internetforbindelse</string>
 	<string name="shared_string_disable">Deaktiver</string>
-	<string name="shared_string_save">Gem</string>
-	<string name="add_device_descr">Indtast enheds-id, som kan findes på https://live.osmand.net/device/ID</string>
-	<string name="device_id">Enheds-id</string>
 	<string name="add_device">Tilføj enhed</string>
-	<string name="share_location_as_descr">Giver mulighed for at dele enhedens placering, eller placering af brugerdefinerede enheder det tilføjes via API.</string>
 	<string name="share_location_as">Del placering som</string>
 	<string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
 	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ud af OsmAnd Telegram, så du ikke kan dele din placering eller se placeringen af andre\?</string>
@@ -61,7 +54,6 @@
 	<string name="gps_and_location">GPS og placering</string>
 	<string name="sharing_time">Delingstidsrum</string>
 	<string name="expire_at">Udløber</string>
-	<string name="stop_sharing_all">Deling er aktiveret (deaktiver)</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>
@@ -102,12 +94,8 @@
 	<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>
-	<string name="initialization">Initialisering</string>
-	<string name="logging_out">Logger ud</string>
-	<string name="closing">Lukker</string>
 	<string name="shared_string_continue">Fortsæt</string>
 	<string name="shared_string_cancel">Annuller</string>
-	<string name="gps_network_not_enabled">Placeringtjenesten er ikke aktiveret. Aktiver\?</string>
 	<string name="shared_string_settings">Indstillinger</string>
 	<string name="no_location_permission">Mangler tilladelse til at bruge placeringsdata.</string>
 	<string name="gps_not_available">Aktiver GPS i indstillinger</string>
@@ -117,11 +105,6 @@
 	<string name="shared_string_distance">Afstand</string>
 	<string name="share_location">Del placering</string>
 	<string name="sharing_location">Deler placering</string>
-	<string name="shared_string_paused">Pauset</string>
-	<string name="shared_string_no_data">Ingen data</string>
-	<string name="shared_string_pause">Pause</string>
-	<string name="shared_string_start">Start</string>
-	<string name="shared_string_stop">Stop</string>
 	<string name="process_service">OsmAnd Telegram tjeneste</string>
 	<string name="osmand_logo">OsmAnd logo</string>
 	<string name="install_osmand_dialog_message">Det er nødvendigt at installere en gratis eller betalt version af OsmAnd</string>

OsmAnd-telegram/res/values-de/strings.xml

@@ -4,18 +4,12 @@
 	<string name="not_sent_yet">Noch nicht gesendet</string>
 	<string name="not_found_yet">Noch nicht gefunden</string>
 	<string name="re_send_location">Position neu senden</string>
-	<string name="last_sent_location">Letzter gesendeter Standort</string>
 	<string name="sharing_status">Freigabestatus</string>
 	<string name="sharing_enabled">Teilen: Aktiviert</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Kein GPS-Signal</string>
-	<string name="sharing_success">Gesendet und aktualisiert</string>
-	<string name="not_possible_to_send_to_chats">Konnte nicht an Chats senden:</string>
 	<string name="no_internet_connection">Keine Internetverbindung</string>
 	<string name="shared_string_disable">Deaktivieren</string>
-	<string name="shared_string_save">Speichern</string>
-	<string name="add_device_descr">Finden Sie Ihre Geräte-ID unter https://live.osmand.net/device/ID</string>
-	<string name="device_id">Geräte-ID</string>
 	<string name="add_device">Gerät hinzufügen</string>
 	<string name="shared_string_later">Später</string>
 	<string name="last_available_location">Letzter verfügbarer Standort</string>
@@ -80,12 +74,8 @@
 	<string name="shared_string_login">Anmelden</string>
 	<string name="shared_string_logout">Abmelden</string>
 	<string name="not_logged_in">Sie sind nicht angemeldet</string>
-	<string name="initialization">Initialisierung</string>
-	<string name="logging_out">Abmeldung</string>
-	<string name="closing">Schließen</string>
 	<string name="shared_string_continue">Fortfahren</string>
 	<string name="shared_string_cancel">Abbrechen</string>
-	<string name="gps_network_not_enabled">Standortdienst einschalten\?</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>
@@ -93,11 +83,6 @@
 	<string name="osmand_service_descr">OsmAnd Telegram läuft im Hintergrund bei ausgeschaltetem Bildschirm.</string>
 	<string name="shared_string_distance">Distanz</string>
 	<string name="share_location">Standort teilen</string>
-	<string name="shared_string_paused">Pausiert</string>
-	<string name="shared_string_no_data">Keine Daten</string>
-	<string name="shared_string_pause">"Pause "</string>
-	<string name="shared_string_start">"Start "</string>
-	<string name="shared_string_stop">"Stop "</string>
 	<string name="process_service">OsmAnd Telegram-Service</string>
 	<string name="osmand_logo">OsmAnd-Logo</string>
 	<string name="install_osmand_dialog_message">Sie müssen zuerst die kostenlose oder kostenpflichtige Version von OsmAnd installieren</string>
@@ -151,7 +136,6 @@
 	<string name="last_updated_location">Zuletzt aktualisierter Ort:</string>
 	<string name="not_possible_to_send_to_telegram_chats">Es ist nicht möglich, an Telegram-Chats zu senden:</string>
 	<string name="battery_optimization_description">Schalten Sie die Batterieoptimierung für OsmAnd Telegram aus, damit es nicht plötzlich im Hintergrund ausgeschaltet wird.</string>
-	<string name="share_location_as_descr">Die gemeinsame Nutzung Ihres Geräte-Standorts oder des Standorts benutzerdefinierter Geräte erlauben, die über die API hinzugefügt wurden.</string>
 	<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>
@@ -162,7 +146,6 @@
 	<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="stop_sharing_all">Freigabe ist aktiviert (deaktivieren)</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>

OsmAnd-telegram/res/values-es-rUS/strings.xml

@@ -10,21 +10,14 @@
 	<string name="not_sent_yet">No enviado aún</string>
 	<string name="not_found_yet">Aún no encontrada</string>
 	<string name="re_send_location">Reenviar ubicación</string>
-	<string name="last_sent_location">Última ubicación enviada</string>
 	<string name="last_available_location">Última ubicación disponible</string>
 	<string name="sharing_status">Estado de compartición</string>
 	<string name="sharing_enabled">Compartir: Activado</string>
 	<string name="shared_string_status">Estado</string>
 	<string name="no_gps_connection">Sin conexión GPS</string>
-	<string name="sharing_success">Enviado y actualizado con éxito</string>
-	<string name="not_possible_to_send_to_chats">Imposible enviar a los chats:</string>
 	<string name="no_internet_connection">Sin conexión a Internet</string>
 	<string name="shared_string_disable">Desactivar</string>
-	<string name="shared_string_save">Guardar</string>
-	<string name="add_device_descr">Ingrese su ID de dispositivo que puede encontrar en https://live.osmand.net/device/ID</string>
-	<string name="device_id">Id. del dispositivo</string>
 	<string name="add_device">Añadir dispositivo</string>
-	<string name="share_location_as_descr">Permite compartir la ubicación de este dispositivo o la ubicación del dispositivo personalizado añadido a través de dispositivos API.</string>
 	<string name="share_location_as">Compartir ubicación como</string>
 	<string name="live_now_description">Contactos y grupos que comparten su ubicación con usted.</string>
 	<string name="logout_from_osmand_telegram_descr">Si cierra sesión en OsmAnd Telegram, no podrá enviar su posición ni ver la ubicación de sus contactos en el mapa de OsmAnd.</string>
@@ -63,7 +56,6 @@
 	<string name="gps_and_location">GPS y ubicación</string>
 	<string name="sharing_time">Tiempo compartido</string>
 	<string name="expire_at">Expira en</string>
-	<string name="stop_sharing_all">El uso compartido está activado (desactivar)</string>
 	<string name="turn_off_location_sharing">Desactivar el uso compartido de ubicaciones</string>
 	<string name="open_osmand">Abrir OsmAnd</string>
 	<string name="shared_string_live">En vivo</string>
@@ -104,12 +96,8 @@
 	<string name="shared_string_login">Iniciar sesión</string>
 	<string name="shared_string_logout">Cerrar sesión</string>
 	<string name="not_logged_in">No ha iniciado sesión</string>
-	<string name="initialization">Inicialización</string>
-	<string name="logging_out">Cerrar sesión</string>
-	<string name="closing">Cerrando</string>
 	<string name="shared_string_continue">Continuar</string>
 	<string name="shared_string_cancel">Cancelar</string>
-	<string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo\?</string>
 	<string name="shared_string_settings">Ajustes</string>
 	<string name="no_location_permission">La aplicación no tiene permiso de acceso a los datos de ubicación.</string>
 	<string name="gps_not_available">Activa el GPS en ajustes</string>
@@ -119,11 +107,6 @@
 	<string name="shared_string_distance">Distancia</string>
 	<string name="share_location">Compartir ubicación</string>
 	<string name="sharing_location">Compartir ubicación</string>
-	<string name="shared_string_paused">Pausado</string>
-	<string name="shared_string_no_data">Sin datos</string>
-	<string name="shared_string_pause">Pausar</string>
-	<string name="shared_string_start">Iniciar</string>
-	<string name="shared_string_stop">Parar</string>
 	<string name="process_service">Servicio de OsmAnd Telegram</string>
 	<string name="osmand_logo">Logotipo de OsmAnd</string>
 	<string name="install_osmand_dialog_message">Necesita instalar primero una versión gratuita o de pago de OsmAnd</string>

OsmAnd-telegram/res/values-es/strings.xml

@@ -10,21 +10,14 @@
 	<string name="not_sent_yet">No enviado aún</string>
 	<string name="not_found_yet">Aún no encontrada</string>
 	<string name="re_send_location">Reenviar ubicación</string>
-	<string name="last_sent_location">Última ubicación enviada</string>
 	<string name="last_available_location">Última ubicación disponible</string>
 	<string name="sharing_status">Estado de compartición</string>
 	<string name="sharing_enabled">Compartir: Activado</string>
 	<string name="shared_string_status">Estado</string>
 	<string name="no_gps_connection">Sin conexión GPS</string>
-	<string name="sharing_success">Enviado y actualizado con éxito</string>
-	<string name="not_possible_to_send_to_chats">Imposible enviar a los chats:</string>
 	<string name="no_internet_connection">Sin conexión a Internet</string>
 	<string name="shared_string_disable">Desactivar</string>
-	<string name="shared_string_save">Guardar</string>
-	<string name="add_device_descr">Ingrese su ID de dispositivo que puede encontrar en https://live.osmand.net/device/ID</string>
-	<string name="device_id">Id. del dispositivo</string>
 	<string name="add_device">Añadir dispositivo</string>
-	<string name="share_location_as_descr">Permite compartir la ubicación de este dispositivo o la ubicación del dispositivo personalizado añadido a través de dispositivos API.</string>
 	<string name="share_location_as">Compartir ubicación como</string>
 	<string name="live_now_description">Contactos y grupos que comparten su ubicación con usted.</string>
 	<string name="logout_from_osmand_telegram_descr">Si cierra sesión en OsmAnd Telegram, no podrá enviar su posición ni ver la ubicación de sus contactos en el mapa de OsmAnd.</string>
@@ -63,7 +56,6 @@
 	<string name="gps_and_location">GPS y ubicación</string>
 	<string name="sharing_time">Tiempo compartido</string>
 	<string name="expire_at">Expira en</string>
-	<string name="stop_sharing_all">El uso compartido está activado (desactivar)</string>
 	<string name="turn_off_location_sharing">Desactivar el uso compartido de ubicaciones</string>
 	<string name="open_osmand">Abrir OsmAnd</string>
 	<string name="shared_string_live">En vivo</string>
@@ -104,12 +96,8 @@
 	<string name="shared_string_login">Iniciar sesión</string>
 	<string name="shared_string_logout">Cerrar sesión</string>
 	<string name="not_logged_in">No ha iniciado sesión</string>
-	<string name="initialization">Inicialización</string>
-	<string name="logging_out">Cerrar sesión</string>
-	<string name="closing">Cerrando</string>
 	<string name="shared_string_continue">Continuar</string>
 	<string name="shared_string_cancel">Cancelar</string>
-	<string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo\?</string>
 	<string name="shared_string_settings">Ajustes</string>
 	<string name="no_location_permission">La aplicación no tiene permiso de acceso a los datos de ubicación.</string>
 	<string name="gps_not_available">Active el GPS en los ajustes</string>
@@ -119,11 +107,6 @@
 	<string name="shared_string_distance">Distancia</string>
 	<string name="share_location">Compartir ubicación</string>
 	<string name="sharing_location">Compartir ubicación</string>
-	<string name="shared_string_paused">Pausado</string>
-	<string name="shared_string_no_data">Sin datos</string>
-	<string name="shared_string_pause">Pausar</string>
-	<string name="shared_string_start">Iniciar</string>
-	<string name="shared_string_stop">Parar</string>
 	<string name="process_service">Servicio de OsmAnd Telegram</string>
 	<string name="osmand_logo">Logotipo de OsmAnd</string>
 	<string name="install_osmand_dialog_message">Necesita instalar primero una versión gratuita o de pago de OsmAnd</string>

OsmAnd-telegram/res/values-gl/strings.xml

@@ -7,19 +7,14 @@
 	<string name="not_sent_yet">Aínda non enviado</string>
 	<string name="not_found_yet">Aínda non atopado</string>
 	<string name="re_send_location">Voltar a enviar ubicación</string>
-	<string name="last_sent_location">Derradeira ubicación enviada</string>
 	<string name="last_available_location">Derradeira ubicación dispoñíbel</string>
 	<string name="sharing_status">Estado de emprego partillado ou compartido</string>
 	<string name="sharing_enabled">Partillar ou compartir: Activado</string>
 	<string name="shared_string_status">Estado</string>
 	<string name="no_gps_connection">Sen unha conexión GPS</string>
-	<string name="sharing_success">Enviado e actualizado de xeito correcto</string>
-	<string name="not_possible_to_send_to_chats">Non é posíbel enviar ás parolas:</string>
 	<string name="no_internet_connection">Sen conexión á Internet</string>
 	<string name="shared_string_disable">Desactivar</string>
 	<string name="shared_string_save">Gardar</string>
-	<string name="add_device_descr">Insira o seu ID do dispositivo que pode atopar en https://live.osmand.net/device/ID</string>
-	<string name="device_id">Identificador do dispositivo</string>
 	<string name="add_device">Engadir dispositivo</string>
 	<string name="share_location_as">Partillar ou compartir ubicación coma</string>
 	<string name="live_now_description">Contactos e grupos que partillan ou comparten a súa ubicación con vostede.</string>

OsmAnd-telegram/res/values-nb-rNO/strings.xml

@@ -10,21 +10,14 @@
 	<string name="not_sent_yet">Ikke sendt enda</string>
 	<string name="not_found_yet">Ikke funnet enda</string>
 	<string name="re_send_location">Send plassering på ny</string>
-	<string name="last_sent_location">Sist sendte plassering</string>
 	<string name="last_available_location">Sist tilgjengelige plassering</string>
 	<string name="sharing_status">Delingsstatus</string>
 	<string name="sharing_enabled">Deling: Påslått</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Ingen GPS-tilkobling</string>
-	<string name="sharing_success">Sendt og oppdatert</string>
-	<string name="not_possible_to_send_to_chats">Kunne ikke sende sludring:</string>
 	<string name="no_internet_connection">Ingen internettilknytning</string>
 	<string name="shared_string_disable">Skru av</string>
-	<string name="shared_string_save">Lagre</string>
-	<string name="add_device_descr">Skriv inn din enhets-ID fra https://live.osmand.net/device/ID</string>
-	<string name="device_id">Enhets-ID</string>
 	<string name="add_device">Legg til enhet</string>
-	<string name="share_location_as_descr">Dette valget lar deg dele enhetens plassering, eller plassering for egendefinert lagt til via API-enheter.</string>
 	<string name="share_location_as">Del plassering som</string>
 	<string name="live_now_description">Kontakter og grupper som deler sin plassering med deg.</string>
 	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ut av OsmAnd Telegram\? Etter det, vil du ikke kunne sende din plassering, og se dine kontakters plassering på kartet i OsmAnd.</string>
@@ -63,7 +56,6 @@
 	<string name="gps_and_location">GPS og plassering</string>
 	<string name="sharing_time">Delingstid</string>
 	<string name="expire_at">Utløper</string>
-	<string name="stop_sharing_all">Deling er påslått (skru av)</string>
 	<string name="turn_off_location_sharing">Skru av plasseringsdeling</string>
 	<string name="open_osmand">Åpne OsmAnd</string>
 	<string name="shared_string_live">Sanntid</string>
@@ -104,12 +96,8 @@
 	<string name="shared_string_login">Logg inn</string>
 	<string name="shared_string_logout">Logg ut</string>
 	<string name="not_logged_in">Du er ikke innlogget</string>
-	<string name="initialization">Igangsetting</string>
-	<string name="logging_out">Logger ut</string>
-	<string name="closing">Lukker</string>
 	<string name="shared_string_continue">Fortsett</string>
 	<string name="shared_string_cancel">Avbryt</string>
-	<string name="gps_network_not_enabled">Skru på plasseringstjeneste\?</string>
 	<string name="shared_string_settings">Innstillinger</string>
 	<string name="no_location_permission">Programmet mangler tilgang til plasseringsdata.</string>
 	<string name="gps_not_available">Skru på GPS i innstillingene</string>
@@ -119,11 +107,6 @@
 	<string name="shared_string_distance">Distanse</string>
 	<string name="share_location">Del plassering</string>
 	<string name="sharing_location">Deler plassering</string>
-	<string name="shared_string_paused">Pauset</string>
-	<string name="shared_string_no_data">Ingen data</string>
-	<string name="shared_string_pause">Pause</string>
-	<string name="shared_string_start">Start</string>
-	<string name="shared_string_stop">Stopp</string>
 	<string name="process_service">OsmAnd Telegram-tjeneste</string>
 	<string name="osmand_logo">OsmAnd-logo</string>
 	<string name="install_osmand_dialog_message">Du må installere gratis- eller betalt versjon av OsmAnd først</string>

OsmAnd-telegram/res/values-pl/strings.xml

@@ -10,21 +10,14 @@
 	<string name="not_sent_yet">Jeszcze nie wysłane</string>
 	<string name="not_found_yet">Jeszcze nie znaleziono</string>
 	<string name="re_send_location">Wyślij ponownie lokalizację</string>
-	<string name="last_sent_location">Ostatnia wysłana lokalizacja</string>
 	<string name="last_available_location">Ostatnia dostępna lokalizacja</string>
 	<string name="sharing_status">Status udostępniania</string>
 	<string name="sharing_enabled">Udostępnianie: Włączone</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Brak połączenia GPS</string>
-	<string name="sharing_success">Pomyślnie wysłano i zaktualizowano</string>
-	<string name="not_possible_to_send_to_chats">Nie można wysłać na czat:</string>
 	<string name="no_internet_connection">Brak połączenia z internetem</string>
 	<string name="shared_string_disable">Wyłącz</string>
-	<string name="shared_string_save">Zapisz</string>
-	<string name="add_device_descr">Wprowadź swój identyfikator urządzenia, który można znaleźć w https://live.osmand.net/device/ID</string>
-	<string name="device_id">Identyfikator urządzenia</string>
 	<string name="add_device">Dodaj urządzenie</string>
-	<string name="share_location_as_descr">Ta opcja umożliwia udostępnianie lokalizacji urządzenia lub lokalizacji niestandardowych dodawanych przez urządzenia interfejsu API.</string>
 	<string name="share_location_as">Udostępnij lokalizację jako</string>
 	<string name="live_now_description">Kontakty i grupy, które udostępniają Ci swoją lokalizację.</string>
 	<string name="logout_from_osmand_telegram_descr">Czy na pewno chcesz się wylogować z OsmAnd Telegram\? Po tym czasie nie będziesz mógł wysłać swojej pozycji i zobaczyć lokalizacji swoich kontaktów na mapie w OsmAnd.</string>
@@ -61,7 +54,6 @@
 	<string name="gps_and_location">GPS i lokalizacja</string>
 	<string name="sharing_time">Czas udostępniania</string>
 	<string name="expire_at">Wygasa o</string>
-	<string name="stop_sharing_all">Udostępnianie jest włączone (wyłącz)</string>
 	<string name="turn_off_location_sharing">Wyłącz udostępnianie lokalizacji</string>
 	<string name="open_osmand">Otwórz OsmAnd</string>
 	<string name="shared_string_live">Na żywo</string>
@@ -102,12 +94,8 @@
 	<string name="shared_string_login">Zaloguj się</string>
 	<string name="shared_string_logout">Wyloguj się</string>
 	<string name="not_logged_in">Nie jesteś zalogowany/a</string>
-	<string name="initialization">Inicjalizacja</string>
-	<string name="logging_out">Wylogowywanie</string>
-	<string name="closing">Zamykanie</string>
 	<string name="shared_string_continue">Kontynuuj</string>
 	<string name="shared_string_cancel">Anuluj</string>
-	<string name="gps_network_not_enabled">Usługa lokalizacji nie jest włączona. Włączyć ją\?</string>
 	<string name="shared_string_settings">Opcje</string>
 	<string name="no_location_permission">Aplikacja nie ma uprawnień dostępu do danych o położeniu.</string>
 	<string name="gps_not_available">Proszę włączyć GPS w opcjach</string>
@@ -117,11 +105,6 @@
 	<string name="shared_string_distance">Odległość</string>
 	<string name="share_location">Udostępnij lokalizację</string>
 	<string name="sharing_location">Udostępnianie lokalizacji</string>
-	<string name="shared_string_paused">Wstrzymano</string>
-	<string name="shared_string_no_data">Brak danych</string>
-	<string name="shared_string_pause">Wstrzymaj</string>
-	<string name="shared_string_start">Rozpocznij</string>
-	<string name="shared_string_stop">Zakończ</string>
 	<string name="process_service">Usługa Telegramu OsmAnd</string>
 	<string name="osmand_logo">Logo OsmAnd</string>
 	<string name="install_osmand_dialog_message">Najpierw musisz zainstalować darmową lub płatną wersję OsmAnd</string>

OsmAnd-telegram/res/values-ru/strings.xml

@@ -1,19 +1,80 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="not_sent_yet">Не отправлено</string>
+<resources>
+	<string name="shared_string_hour_short">ч</string>
+	<string name="shared_string_minute_short">мин</string>
+	<string name="shared_string_second_short">сек</string>
+	<string name="shared_string_name">Имя</string>
+	<string name="by_distance">По расстоянию</string>
+	<string name="by_name">По имени</string>
+	<string name="by_group">По группе</string>
+	<string name="shared_string_sort">Сортировать</string>
+	<string name="shared_string_sort_by">Сортировать по</string>
+	<string name="turn_off_all">Выключить всё</string>
+	<string name="shared_string_exit">Выход</string>
+	<string name="time_ago">назад</string>
+	<string name="last_response">Последний ответ</string>
+	<string name="shared_string_group">Группа</string>
+	<string name="live_now_description">Контакты и группы, отправляющие вам местоположение.</string>
+	<string name="share_location">Поделиться местоположением</string>
+	<string name="shared_string_install">Установить</string>
+	<string name="install_osmand">Установить OsmAnd</string>
+	<string name="shared_string_continue">Продолжить</string>
+	<string name="shared_string_cancel">Отмена</string>
+	<string name="location_sharing_description">Выберите контакты и группы, с которыми вы хотите поделиться своим местоположением.</string>
+	<string name="not_sent_yet">Не отправлено</string>
+	<string name="show_on_map">Показать на карте</string>
+	<string name="open_osmand">Открыть OsmAnd</string>
+	<string name="shared_string_all">Все</string>
+	<string name="shared_string_off">Off</string>
+	<string name="shared_string_settings">Настройки</string>
+	<string name="sharing_time">Время трансляции</string>
+	<string name="turn_off_location_sharing">Отключить отправку локации</string>
+	<string name="expire_at">Истекает в</string>
+	<string name="in_time">через %1$s</string>
+	<string name="shared_string_share">Поделиться</string>
+	<string name="shared_string_back">Назад</string>
+	<string name="set_time_description">Установите время, в течение которого выбранные вами контакты и группы будут видеть ваше местоположение в режиме реального времени.</string>
+	<string name="visible_time_for_all">Видимое время для всех</string>
+	<string name="last_updated_location">Последнее обновление локации:</string>
+	<string name="successfully_sent_and_updated">Успешно отправлено и обновлено</string>
+	<string name="not_possible_to_send_to_telegram_chats">Невозможно отправить Telegram чаты:</string>
+	<string name="waiting_for_response_from_telegram">Ожидание ответа от Telegram</string>
+	<string name="searching_for_gps">Поиск GPS</string>
+	<string name="connecting_to_the_internet">Подключение к Интернету</string>
+	<string name="background_work_description">Измените настройки оптимизации батареи, чтобы обеспечить стабильную отправку местоположения</string>
+	<string name="location_history">История местоположений</string>
+	<string name="stale_location_desc">В последний раз контакт отправил местоположение.</string>
+	<string name="stale_location">Устаревание местоположения</string>
+	<string name="send_my_location_desc">Установите минимальный интервал между отправками местоположения.</string>
+	<string name="send_my_location">Отправка моей позиции</string>
+	<string name="gps_and_location">GPS &amp; местоположение</string>
+	<string name="location_history_desc">Скройте контакты, которые не обновили свое местоположение за определенный промежуток времени.</string>
+	<string name="share_location_as">Поделиться местоположением как</string>
+	<string name="share_location_as_description">Если вы хотите подключить несколько устройств к одной учетной записи Telegram, вам необходимо использовать другое устройство для трансляции местоположения.</string>
+	<string name="osmand_connect_desc">Выберите версию OsmAnd которую OsmAnd Telegram использует для отображения позиций на карте.</string>
+	<string name="osmand_connect">OsmAnd подключение</string>
+	<string name="connected_account">Связанная учетная запись</string>
+	<string name="shared_string_account">Учетная запись</string>
+	<string name="start_location_sharing">Начать отправку локации</string>
+	<string name="install_osmand_dialog_message">Вам необходимо сначала установить бесплатную или платную версию OsmAnd</string>
+	<string name="disconnect_from_telegram">Как отключить передачу данных OsmAnd от Telegram</string>
+	<string name="logout_help_desc">Как отключить передачу данных OsmAnd от Telegram</string>
+	<string name="disconnect_from_telegram_desc">Отмена доступа к отправке локаций. Откройте Telegram, перейдите в Настройки - Конфиденциальность и безопасность - Сессии и завершите сеанс OsmAnd Telegram.</string>
+	<string name="logout_from_osmand_telegram">Выйти из OsmAnd Telegram?</string>
+	<string name="shared_string_login">Войти</string>
+	<string name="shared_string_logout">Выйти</string>
+	<string name="logout_from_osmand_telegram_descr">Вы уверены, что хотите выйти из OsmAnd Telegram, так вы не сможете делиться местоположением или не видеть местоположения других?</string>
+
 	<string name="not_found_yet">Не найдено</string>
 	<string name="re_send_location">Отправить местоположение</string>
-	<string name="last_sent_location">Последнее отправление</string>
 	<string name="last_available_location">Последнее местоположение</string>
 	<string name="sharing_status">Статус отправки</string>
-	<string name="sharing_enabled">Отправка: включена</string>
+	<string name="sharing_enabled">Трансляция: включена</string>
 	<string name="shared_string_status">Статус</string>
 	<string name="no_gps_connection">Отсутствует GPS</string>
-	<string name="sharing_success">Отправлено успешно</string>
-	<string name="not_possible_to_send_to_chats">Нет возможности отправить в:</string>
 	<string name="no_internet_connection">Отсутствует интернет</string>
 	<string name="shared_string_disable">Отключить</string>
 	<string name="shared_string_save">Сохранить</string>
-	<string name="device_id">ID устройства</string>
 	<string name="add_device">Добавить устройство</string>
 	<string name="go_to_settings">Перейти в настройки</string>
 	<string name="shared_string_later">Позже</string>

OsmAnd-telegram/res/values/strings.xml

@@ -8,12 +8,12 @@
 	<string name="device_name_cannot_be_empty">Device name cannot be empty</string>
 	<string name="device_name">Device name</string>
 	<string name="shared_string_hide">Hide</string>
-	<string name="share_location_as_description_second_line">The Device ID can be created and viewed in the Telegram client using the %1$s chat bot. %2$s</string>
-	<string name="share_location_as_description">When connecting multiple devices to one Telegram account, use a different device to share your location.</string>
 	<string name="add_new_device_description">Last sent location:</string>
-	<string name="last_updated_location">Last sent location:</string>
+	<string name="share_location_as_description_second_line">You can create and view the Device ID in the telegram client using the %1$s chat bot. %2$s</string>
-	<string name="successfully_sent_and_updated">Sent and updated.</string>
+	<string name="share_location_as_description">If you want to connect multiple devices to one telegram account, you need to use different Device to share your location.</string>
-	<string name="not_possible_to_send_to_telegram_chats">Could not send to Telegram chats:</string>
+	<string name="last_updated_location">Last updated location:</string>
+	<string name="successfully_sent_and_updated">Successfully sent and updated</string>
+	<string name="not_possible_to_send_to_telegram_chats">Not possible to send to Telegram chats:</string>
 	<string name="waiting_for_response_from_telegram">Waiting for response from Telegram</string>
 	<string name="sending_location_messages">Sending location</string>
 	<string name="initializing">Starting</string>
@@ -28,21 +28,15 @@
 	<string name="not_sent_yet">Not sent yet</string>
 	<string name="not_found_yet">Not found yet</string>
 	<string name="re_send_location">Re-send location</string>
-	<string name="last_sent_location">Last sent location</string>
 	<string name="last_available_location">Last available location</string>
 	<string name="sharing_status">Sharing status</string>
 	<string name="sharing_enabled">Sharing: Enabled</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">No GPS connection</string>
-	<string name="sharing_success">Sent and updated</string>
-	<string name="not_possible_to_send_to_chats">Could not send to chats:</string>
 	<string name="no_internet_connection">No internet connection</string>
 	<string name="shared_string_disable">Disable</string>
 	<string name="shared_string_save">Save</string>
-	<string name="add_device_descr">Copy your device ID from https://live.osmand.net/device/ID</string>
-	<string name="device_id">Device ID</string>
 	<string name="add_device">Add device</string>
-	<string name="share_location_as_descr">Allow sharing your device location, or location of custom devices added via API.</string>
 	<string name="share_location_as">Share location as</string>
 	<string name="live_now_description">Contacts and groups sharing location to you.</string>
 	<string name="logout_from_osmand_telegram_descr">Are you sure you want to log out of OsmAnd Telegram so you can\'t share location or see the location of others?</string>
@@ -122,13 +116,13 @@
 	<string name="password_descr">Telegram password</string>
 	<string name="shared_string_login">Log in</string>
 	<string name="shared_string_logout">Log out</string>
-	<string name="not_logged_in">Not logged in</string>
 	<string name="initialization">Starting</string>
 	<string name="logging_out">Logging out</string>
 	<string name="closing">Closing</string>
+	<string name="gps_network_not_enabled">Turn on \"Location\"?</string>
+	<string name="not_logged_in">You are not logged in</string>
 	<string name="shared_string_continue">Continue</string>
 	<string name="shared_string_cancel">Cancel</string>
-	<string name="gps_network_not_enabled">Turn on \"Location\"?</string>
 	<string name="shared_string_settings">Settings</string>
 	<string name="no_location_permission">App lacks permission for location data access.</string>
 	<string name="gps_not_available">Please turn on \"Location\" in the system settings</string>
@@ -138,11 +132,6 @@
 	<string name="shared_string_distance">Distance</string>
 	<string name="share_location">Share location</string>
 	<string name="sharing_location">Sharing location</string>
-	<string name="shared_string_paused">Paused</string>
-	<string name="shared_string_no_data">No data</string>
-	<string name="shared_string_pause">Pause</string>
-	<string name="shared_string_start">Start</string>
-	<string name="shared_string_stop">Stop</string>
 	<string name="process_service">OsmAnd Telegram service</string>
 	<string name="osmand_logo">OsmAnd logo</string>
 	<string name="install_osmand_dialog_message">You need to install the free or paid version of OsmAnd first</string>
@@ -182,7 +171,7 @@
 	<string name="plus">+</string>
 	<string name="welcome_descr"><![CDATA[<b>OsmAnd Location Sharing</b> lets you share your location and see that of others in the OsmAnd.<br/><br/>The app uses Telegram API and you need a Telegram account.]]></string>
 	<string name="my_location">My location</string>
-	<string name="live_now">Sending…</string>
+	<string name="live_now">Live now</string>
 
 
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -3833,4 +3833,8 @@
 
 	<string name="poi_shoe_repair">Ремонт обуви</string>
 
+	<string name="poi_bulk_purchase">Массовая закупка</string>
+	<string name="poi_bulk_purchase_yes">Массовая закупка: есть</string>
+	<string name="poi_bulk_purchase_only">Только массовая закупка</string>
+
 </resources>

OsmAnd/res/values/phrases.xml

@@ -107,6 +107,7 @@
 	<string name="poi_service_car">Car service</string>
 	<string name="poi_glacier_type">Glacier type</string>
 	<string name="poi_checkpoint_type">Checkpoint type</string>
+	<string name="poi_bulk_purchase">Bulk purchase</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -3857,4 +3858,7 @@
 
 	<string name="poi_shoe_repair">Shoe repair</string>
 
+	<string name="poi_bulk_purchase_yes">Bulk purchase: yes</string>
+	<string name="poi_bulk_purchase_only">Bulk purchase: only</string>
+
 </resources>