Merge branch 'master' into QuickActionRedesign

OsmAnd-java/src/main/java/net/osmand/data/City.java

@@ -161,8 +161,12 @@ public class City extends MapObject {
 
 	public JSONObject toJSON(boolean includingBuildings) {
 		JSONObject json = super.toJSON();
-		json.put("type", type.name());
-		json.put("postcode", postcode);
+		if (type != null) {
+			json.put("type", type.name());
+		}
+		if (postcode != null) {
+			json.put("postcode", postcode);
+		}
 		JSONArray listOfStreetsArr = new JSONArray();
 		for (Street s : listOfStreets) {
 			listOfStreetsArr.put(s.toJSON(includingBuildings));

OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java

@@ -786,22 +786,23 @@ public class SearchUICore {
 				cities = new HashSet<>();
 			}
 			Set<Street> streets = new HashSet<>();
-
-			for (MapObject obj : exportedObjects) {
-				if (obj instanceof Amenity) {
-					amenities.add((Amenity) obj);
-				} else if (obj instanceof Street) {
-					Street street = (Street) obj;
-					streets.add(street);
-					if (street.getCity() != null) {
-						final City city = street.getCity();
+			if (exportedObjects != null) {
+				for (MapObject obj : exportedObjects) {
+					if (obj instanceof Amenity) {
+						amenities.add((Amenity) obj);
+					} else if (obj instanceof Street) {
+						Street street = (Street) obj;
+						streets.add(street);
+						if (street.getCity() != null) {
+							final City city = street.getCity();
+							cities.add(city);
+							streetCities.add(city);
+						}
+					} else if (obj instanceof City) {
+						City city = (City) obj;
 						cities.add(city);
-						streetCities.add(city);
+						matchedCities.add(city);
 					}
-				} else if (obj instanceof City) {
-					City city = (City) obj;
-					cities.add(city);
-					matchedCities.add(city);
 				}
 			}
 			for (City city : cities) {
@@ -834,7 +835,7 @@ public class SearchUICore {
 				JSONArray citiesArr = new JSONArray();
 				for (City city : cities) {
 					final JSONObject cityObj = city.toJSON(exportSettings.isExportBuildings());
-					if (exportedCities.contains(city)) {
+					if (exportedCities != null && exportedCities.contains(city)) {
 						if (!exportSettings.isExportEmptyCities()) {
 							continue;
 						}

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

@@ -30,7 +30,7 @@
     <string name="not_found_yet">Яшчэ не знойдзена</string>
     <string name="re_send_location">Пераадправіць звесткі аб месцазнаходжанні</string>
     <string name="last_available_location">Апошняе даступнае месца</string>
-    <string name="sharing_status">"Статус абмену "</string>
+    <string name="sharing_status">Статус абмену</string>
     <string name="location_sharing_status">Абмен: %1$s</string>
     <string name="shared_string_enabled">Уключана</string>
     <string name="shared_string_status">Статус</string>
@@ -75,7 +75,7 @@
     <string name="send_my_location_desc">Вызначыць мінімальны інтэрвал для абмену інфармацыяй аб месцазнаходжанні.</string>
     <string name="send_my_location">Адправіць маё месцазнаходжанне</string>
     <string name="gps_and_location">Пазіцыя</string>
-    <string name="sharing_time">"Час абмену "</string>
+    <string name="sharing_time">Час абмену</string>
     <string name="expire_at">Сыходзіць</string>
     <string name="stop_sharing_all">Абмен уключаны (выключыць)</string>
     <string name="turn_off_location_sharing">Выключыць абмен</string>
@@ -168,9 +168,7 @@
     <string name="shared_string_hour_short">г</string>
     <string name="shared_string_minute_short">хвіл</string>
     <string name="shared_string_second_short">сек</string>
-    <string name="welcome_descr">
-        <b>Назіральнік OsmAnd</b> Дае магчымасць дзяліцца сваім месцазнаходжаннем і бачыць месцазнаходжанне іншых у OsmAnd.<br/>
-        <br/> Дадатак выкарыстоўвае Telegram API, таму вам неабходны акаўнт Тэлеграм.</string>
+    <string name="welcome_descr"><b>Назіральнік OsmAnd</b> Дае магчымасць дзяліцца сваім месцазнаходжаннем і бачыць месцазнаходжанне іншых у OsmAnd.<br/> <br/> Дадатак выкарыстоўвае Telegram API, таму вам неабходны акаўнт Тэлеграм.</string>
     <string name="my_location">Маё месцазнаходжанне</string>
     <string name="live_now">Зараз дзейнічае</string>
     <string name="send_location_as">Адправіць месцазнаходжанне як</string>
@@ -246,10 +244,10 @@
     <string name="timeline_no_data_descr">Даныя для абранага дня адсутнічаюць</string>
     <string name="timeline_no_data">Няма даных</string>
     <string name="shared_string_end">Канец</string>
-    <string name="shared_string_start">Пачатак</string>
+    <string name="shared_string_start">Запусціць назіральнік</string>
     <string name="shared_string_apply">Ужыць</string>
     <string name="set_time_timeline_descr">Абраць час для паказу</string>
-    <string name="start_end_date">Пачатак - дата завяршэння</string>
+    <string name="start_end_date">Дата пачатку - дата завяршэння</string>
     <string name="saved_messages">Захаваныя паведамленні</string>
     <string name="time_zone_descr">Абярыце часавы пояс, каб паказваць ваш час у паведамленнях.</string>
     <string name="time_zone">Часавы пояс</string>

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

@@ -18,7 +18,7 @@
     <string name="share_location_as">Standort teilen als</string>
     <string name="live_now_description">Kontakte und Gruppen, die ihren Standort mit Ihnen teilen.</string>
     <string name="logout_from_osmand_telegram">Aus OsmAnd Tracker abmelden\?</string>
-    <string name="shared_string_name">"Name "</string>
+    <string name="shared_string_name">Name</string>
     <string name="by_distance">Nach Entfernung</string>
     <string name="by_name">Nach Namen</string>
     <string name="by_group">Nach Gruppe</string>
@@ -44,7 +44,7 @@
     <string name="send_my_location">Meinen Standort senden</string>
     <string name="gps_and_location">Position</string>
     <string name="open_osmand">OsmAnd öffnen</string>
-    <string name="shared_string_live">"Live "</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 Standortfreigabe nutzen zu können.</string>
     <string name="get_telegram_description_continue">Bitte installieren Sie Telegram und richten Sie ein Konto ein.</string>
@@ -151,9 +151,7 @@
     <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 Tracker</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, also benötigen Sie ein Telegram-Konto.</string>
+    <string name="welcome_descr"><b>OsmAnd Tracker</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, also benötigen Sie ein Telegram-Konto.</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>

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

@@ -77,7 +77,7 @@
     <string name="shared_string_back">Atzera</string>
     <string name="start_location_sharing">Partekatu kokapena</string>
     <string name="show_on_map">Erakutsi mapan</string>
-    <string name="app_name">OsmAnd Online GPS Tracker</string>
+    <string name="app_name">OsmAnd lineako GPS aztarnaria</string>
     <string name="phone_number_title">Telefono zenbakia</string>
     <string name="phone_number_descr">Telefono zenbakia formatu internazionalean</string>
     <string name="shared_string_password">Pasahitza</string>
@@ -100,7 +100,7 @@
     <string name="shared_string_distance">Distantzia</string>
     <string name="share_location">Partekatu kokapena</string>
     <string name="sharing_location">Partekatzen kokapena</string>
-    <string name="process_service">OsmAnd Tracker zebitzua</string>
+    <string name="process_service">OsmAnd aztarnaria zerbitzua</string>
     <string name="osmand_logo">OsmAnd logoa</string>
     <string name="install_osmand_dialog_message">OsmAnd doako edo ordainpeko bertsioa instalatu behar duzu lehenik</string>
     <string name="install_osmand">Instalatu OsmAnd</string>
@@ -199,15 +199,15 @@
     <string name="buffer_time_descr">Bufferraren puntuak gordetzeko gehieneko denbora</string>
     <string name="buffer_time">Bufferraren iraungitze-denbora</string>
     <string name="shared_string_suggested">Iradokita</string>
-    <string name="status_widget_title">OsmAnd Tracker-en egoera</string>
+    <string name="status_widget_title">OsmAnd aztarnariaren egoera</string>
     <string name="back_to_osmand">Atzera OsmAnd-era</string>
     <string name="last_response_date">Azken erantzuna: %1$s</string>
     <string name="last_update_from_telegram_duration">Telegram-en azken eguneraketa duela %1$s</string>
     <string name="last_response_duration">Azken erantzuna duela %1$s</string>
     <string name="duration_ago">duela %1$s</string>
-    <string name="welcome_descr"><b>OsmAnd Tracker</b>-ri esker, kokapena partekatu dezakezu eta besteena OsmAnd-en ikus. <br/> <br/> Aplikazioak Telegram APIa erabiltzen du eta, beraz, Telegram kontua behar duzu.</string>
+    <string name="welcome_descr"><b>OsmAnd aztarnaria</b>-ri esker, kokapena partekatu dezakezu eta besteena OsmAnd-en ikus. <br/> <br/> Aplikazioak Telegram APIa erabiltzen du eta, beraz, Telegram kontua behar duzu.</string>
     <string name="shared_string_authorization_descr">Sartu zure Telegram-eko telefono zenbakia nazioarteko formatuan</string>
-    <string name="osmand_service_descr">OsmAnd Tracker atzeko planoan exekutatzen da pantaila itzalita dagoenean.</string>
+    <string name="osmand_service_descr">OsmAnd aztarnaria atzeko planoan exekutatzen da pantaila itzalita dagoenean.</string>
     <string name="location_service_no_gps_available">Hautatu kokapen-hornitzaileetako bat zure kokapena partekatzeko.</string>
     <string name="no_location_permission">Aplikazioak ez du kokapena atzitzeko baimenik.</string>
     <string name="authentication_code_descr">"Telegramek kode bat bidali dizu OsmAnd-ek  zure kontuan saioa hasteko."</string>
@@ -234,11 +234,11 @@
     <string name="stale_location_desc">Kontaktu bat mugitu zen azken aldia.</string>
     <string name="location_history_desc">Ezkutatu denbora jakin batean mugitu ez diren kontaktuak</string>
     <string name="osmand_connect">OsmAnd konexioa</string>
-    <string name="osmand_connect_desc">Aukeratu OsmAnd Tracker-ek posizioak bistaratzeko erabiliko duen OsmAnd bertsioa.</string>
+    <string name="osmand_connect_desc">Aukeratu OsmAnd aztarnariak posizioak bistaratzeko erabiliko duen OsmAnd bertsioa.</string>
     <string name="in_time">%1$s-n</string>
-    <string name="logout_help_desc">Nola itzali OsmAnd Tracker Telegram-etik</string>
-    <string name="disconnect_from_telegram">Nola itzali OsmAnd Tracker Telegram-etik</string>
-    <string name="disconnect_from_telegram_desc">Kokapena partekatzeko sarbidea baliogabetzeko. Ireki Telegram, joan Ezarpenak → Pribatutasuna eta segurtasuna → Saioak eta amaitu OsmAnd Tracker saioa atalera.</string>
+    <string name="logout_help_desc">Nola itzali OsmAnd aztarnaria Telegram-etik</string>
+    <string name="disconnect_from_telegram">Nola itzali OsmAnd aztarnaria Telegram-etik</string>
+    <string name="disconnect_from_telegram_desc">Kokapena partekatzeko sarbidea baliogabetzeko. Ireki Telegram, joan Ezarpenak → Pribatutasuna eta segurtasuna → Saioak eta amaitu OsmAnd aztarnariaren saioa atalera.</string>
     <string name="logout_no_internet_msg">"Konektatu Internetera Telegram saioa behar bezala  amaiatzeko."</string>
     <string name="last_response">Azken erantzuna</string>
     <string name="disable_all_sharing_desc">Kokapena partekatzea itzaltzen du hautatutako txat guztietan (%1$d).</string>
@@ -246,8 +246,8 @@
     <string name="by_group">Taldearen arabera</string>
     <string name="by_name">Izenaren arabera</string>
     <string name="by_distance">Distantziaren arabera</string>
-    <string name="logout_from_osmand_telegram">Amaitu OsmAnd Tracker saioa\?</string>
-    <string name="logout_from_osmand_telegram_descr">Ziur zaude OsmAnd Tracker saioa amaitu nahi duzula\? Ezingo duzu kokapena partekatu edo besteen kokapena ikusi</string>
+    <string name="logout_from_osmand_telegram">Amaitu OsmAnd aztarnariaren saioa\?</string>
+    <string name="logout_from_osmand_telegram_descr">Ziur zaude OsmAnd aztarnariaren saioa amaitu nahi duzula\? Ezingo duzu kokapena partekatu edo besteen kokapena ikusi</string>
     <string name="live_now_description">Zurekin kokapena partekatzen duten kontaktuak eta taldeak.</string>
     <string name="location_sharing_status">Partekatzen:% 1 $ s</string>
     <string name="sharing_status">Partekatze egoera</string>
@@ -255,7 +255,7 @@
     <string name="not_found_yet">Oraindik ez da aurkitu</string>
     <string name="not_sent_yet">Oraindik ez da bidali</string>
     <string name="sharing_in_background">Atzeko planoan partekatzea</string>
-    <string name="battery_optimization_description">Itzali bateriaren optimizazioa OsmAnd Trackerrentzat, bat-batean itzali ez dadin bigarren planoan dagoela.</string>
+    <string name="battery_optimization_description">Itzali bateriaren optimizazioa OsmAnd aztarnariarentzat, bat-batean itzali ez dadin bigarren planoan dagoela.</string>
     <string name="background_work">Bigarren planoko lana</string>
     <string name="background_work_description">Aldatu bateriaren optimizazio ezarpenak kokapena partekatzea egonkortzeko.</string>
     <string name="waiting_for_response_from_telegram">Telegram-en erantzunaren zain</string>
@@ -265,6 +265,6 @@
     <string name="share_location_as_description">Hainbat gailu Telegram kontu bakarrera konektatu nahi badituzu, gailu desberdinak erabili behar dituzu kokapena partekatzeko.</string>
     <string name="share_location_as_description_second_line">Telegrama bezeroan gailuaren IDa sortu eta ikusi dezakezu %1$s txat bota erabiliz. % 2 $ s</string>
     <string name="privacy_policy_agree">\"Jarraitu\" sakatuz, Telegram eta OsmAnd pribatutasun-politiken baldintzak onartzen dituzu.</string>
-    <string name="privacy_policy_telegram_client">OsmAnd tracker-ek Telegram plataforma irekia erabiltzen duten bezeroetako bat da. Zure kontaktuek Telegram-eko beste edozein bezero erabil dezakete.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd aztarnariak Telegram plataforma irekia erabiltzen duten bezeroetako bat da. Zure kontaktuek Telegram-eko beste edozein bezero erabil dezakete.</string>
     <string name="last_update_from_telegram_date">Telegram-eko azken eguneratzea: %1$s</string>
 </resources>

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

@@ -216,4 +216,13 @@
     <string name="search_contacts_descr">Procura en tódolos teus grupos e contactos.</string>
     <string name="type_contact_or_group_name">Escribe o nome do contacto ou do grupo</string>
     <string name="shared_string_search">Procurar</string>
+    <string name="status_widget_title">Estado do Rastrexador do OsmAnd</string>
+    <string name="shared_string_suggested">Suxerido</string>
+    <string name="back_to_osmand">Voltar ó OsmAnd</string>
+    <string name="duration_ago">hai %1$s</string>
+    <string name="last_response_duration">Última resposta: hai %1$s</string>
+    <string name="last_update_from_telegram_duration">Última actualización dende o Telegram: hai %1$s</string>
+    <string name="last_response_date">Última resposta: %1$s</string>
+    <string name="last_update_from_telegram_date">Última actualización dende o Telegram: %1$s</string>
+    <string name="shared_string_error_short">ERR</string>
 </resources>

OsmAnd-telegram/res/values-pt-rBR/strings.xml

@@ -26,7 +26,7 @@
     <string name="searching_for_gps">Posicionando…</string>
     <string name="connecting_to_the_internet">Conectando-se à Internet</string>
     <string name="background_work_description">Altere as configurações de otimização da bateria para estabilizar o compartilhamento de local.</string>
-    <string name="background_work">"Funcionamento em segundo plano "</string>
+    <string name="background_work">Funcionamento em segundo plano</string>
     <string name="battery_optimization_description">Desative a otimização da bateria do OsmAnd Tracker para que ele não seja desligado repentinamente quando estiver em segundo plano.</string>
     <string name="sharing_in_background">Compartilhando em segundo plano</string>
     <string name="go_to_settings">Vá para as configurações</string>
@@ -72,7 +72,7 @@
     <string name="shared_string_account">Conta</string>
     <string name="in_time">no %1$s</string>
     <string name="osmand_connect_desc">Escolha a versão OsmAnd que OsmAnd Tracker usa para exibir posições.</string>
-    <string name="osmand_connect">"Conectar OsmAnd "</string>
+    <string name="osmand_connect">Conectar OsmAnd</string>
     <string name="location_history_desc">Ocultar contatos que não foram movidos em um determinado momento.</string>
     <string name="location_history">Histórico de localização</string>
     <string name="stale_location_desc">A última vez que um contato foi movido.</string>
@@ -173,9 +173,7 @@
     <string name="shared_string_hour_short">h</string>
     <string name="shared_string_minute_short">min</string>
     <string name="shared_string_second_short">seg</string>
-    <string name="welcome_descr">
-        <b>OsmAnd Tracker</b> permite que você compartilhe sua localização e veja a dos outros no OsmAnd.<br/>
-        <br/>O aplicativo usa a API Telegram e você precisa de uma conta Telegram.</string>
+    <string name="welcome_descr"><b>OsmAnd Tracker</b> permite que você compartilhe sua localização e veja a dos outros no OsmAnd.<br/> <br/>O aplicativo usa a API Telegram e você precisa de uma conta Telegram.</string>
     <string name="my_location">Minha localização</string>
     <string name="live_now">Ao vivo agora</string>
     <string name="monitoring_is_enabled">Monitoramento está ativado</string>
@@ -186,13 +184,13 @@
     <string name="open_in_osmand">Mostrar no OsmAnd</string>
     <string name="end_date">Data final</string>
     <string name="start_date">Data de início</string>
-    <string name="timeline">"Linha do tempo "</string>
+    <string name="timeline">Linha do tempo</string>
     <string name="gps_points_in_buffer">enviado (%1$d em buffer)</string>
-    <string name="points_size">"%1$d pontos "</string>
+    <string name="points_size">%1$d pontos</string>
     <string name="shared_string_date">Data</string>
     <string name="shared_string_collected">Coletado</string>
     <string name="gps_points">Pontos de GPS</string>
-    <string name="shared_string_sent">"Enviar "</string>
+    <string name="shared_string_sent">Enviar</string>
     <string name="please_update_osmand">Por favor, atualize o OsmAnd para ver os dados no mapa</string>
     <string name="shared_string_update">Atualizar</string>
     <string name="shared_string_telegram">Telegram</string>
@@ -201,7 +199,7 @@
     <string name="privacy_policy_agree">Ao clicar em \"Continuar\", você concorda com as condições da política de privacidade do Telegram- e OsmAnd.</string>
     <string name="shared_string_accept">Aceitar</string>
     <string name="telegram_privacy_policy">Política de privacidade do Telegram</string>
-    <string name="osmand_privacy_policy">"Política de privacidade do OsmAnd "</string>
+    <string name="osmand_privacy_policy">Política de privacidade do OsmAnd</string>
     <string name="how_it_works">Como funciona</string>
     <string name="received_gps_points">Pontos GPX recebidos: %1$s</string>
     <string name="shared_string_appearance">Aparência</string>

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

@@ -137,7 +137,7 @@
     <string name="last_available_location">Последнее местоположение</string>
     <string name="sharing_status">Статус отправки</string>
     <string name="location_sharing_status">Трансляция: %1$s</string>
-    <string name="shared_string_enabled">Включён</string>
+    <string name="shared_string_enabled">Включено</string>
     <string name="shared_string_status">Статус</string>
     <string name="no_gps_connection">Отсутствует GPS</string>
     <string name="no_internet_connection">Отсутствует интернет</string>

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

@@ -53,4 +53,5 @@
     <string name="units_and_formats">Мерне јединице &amp; форматирања</string>
     <string name="unit_of_length_descr">Промени јединице за дужину.</string>
     <string name="unit_of_length">Јединице дужине</string>
+    <string name="shared_string_appearance">Изглед</string>
 </resources>

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

@@ -60,11 +60,11 @@
     <string name="start_end_date">Başlangıç — Bitiş tarihi</string>
     <string name="timeline_no_data_descr">Seçilen gün için toplanan veri yok</string>
     <string name="timeline_no_data">Veri yok</string>
-    <string name="min_logging_distance">Minimum kayıt mesafesi</string>
-    <string name="min_logging_distance_descr">Filtre: yeni bir nokta kaydetmek için minimum mesafe</string>
-    <string name="min_logging_accuracy">Minimum kayıt hassasiyeti</string>
-    <string name="min_logging_accuracy_descr">Filtre: hassasiyete ulaşılmadığı sürece kaydetme yok</string>
-    <string name="min_logging_speed">Minimum kayıt hızı</string>
+    <string name="min_logging_distance">Asgari kayıt mesafesi</string>
+    <string name="min_logging_distance_descr">Filtre: yeni bir nokta kaydetmek için asgari mesafe</string>
+    <string name="min_logging_accuracy">Asgari kayıt doğruluğu</string>
+    <string name="min_logging_accuracy_descr">Filtre: bu doğruluğa ulaşılmadıkça kaydetme yok</string>
+    <string name="min_logging_speed">Asgari kayıt hızı</string>
     <string name="min_logging_speed_descr">Filtre: seçili hızın altında kaydetme yok</string>
     <string name="gpx_settings">GPX ayarları</string>
     <string name="proxy_key">Anahtar</string>
@@ -81,7 +81,7 @@
     <string name="proxy">Proxy</string>
     <string name="privacy">Gizlilik</string>
     <string name="direction">Yön</string>
-    <string name="precision">Hassaslık</string>
+    <string name="precision">Hassasiyet</string>
     <string name="search_contacts">Kişileri ara</string>
     <string name="search_contacts_descr">Tüm gruplarınızda ve kişilerinizde arayın.</string>
     <string name="type_contact_or_group_name">Kişi veya grup adı yazın</string>
@@ -182,7 +182,7 @@
     <string name="location_history">Konum geçmişi</string>
     <string name="stale_location_desc">Bir kişinin en son hareket ettiği zaman.</string>
     <string name="stale_location">Hareket etmiyor</string>
-    <string name="send_my_location_desc">Konum paylaşımı için minimum aralığı ayarlayın.</string>
+    <string name="send_my_location_desc">Konum paylaşımı için en küçük aralığı ayarlayın.</string>
     <string name="send_my_location">Konumumu gönder</string>
     <string name="gps_and_location">Konum</string>
     <string name="sharing_time">Paylaşım zamanı</string>
@@ -256,7 +256,7 @@
     <string name="unit_of_length">Uzunluk birimleri</string>
     <string name="unit_of_speed_system_descr">Hız birimini tanımlayın.</string>
     <string name="unit_of_speed_system">Hız birimi</string>
-    <string name="buffer_time_descr">Noktaların arabellekte saklanacağı maksimum süre</string>
+    <string name="buffer_time_descr">Noktaların arabellekte saklanacağı azami süre</string>
     <string name="buffer_time">Arabellek zaman aşım süresi</string>
     <string name="shared_string_suggested">Önerilen</string>
     <string name="status_widget_title">OsmAnd Tracker durumu</string>